summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2021-07-17 22:25:23 +0200
committerØrjan Malde <red@foxi.me>2021-07-17 22:25:23 +0200
commitd302f5318364c429c7469fff14c40eb88d0a89d7 (patch)
treec3a680afc0d3b118210070f2417b2a87b1511b8d
parentf4ec955897c3179f242212413f13ce4a88096f7b (diff)
downloadmidipix_build-d302f5318364c429c7469fff14c40eb88d0a89d7.tar.bz2
midipix_build-d302f5318364c429c7469fff14c40eb88d0a89d7.tar.xz
groups/231.native_packages_etc.group: php: bump to v8.0.8
Signed-off-by: Ørjan Malde <red@foxi.me>
-rw-r--r--groups/231.native_packages_etc.group8
-rw-r--r--patches/php-8.0.8_pre.local.patch (renamed from patches/php-8.0.6_pre.local.patch)12
2 files changed, 16 insertions, 4 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index d1a77824..c98fe46c 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -347,11 +347,11 @@ zstd")";
: ${PKG_PCRE2_VERSION:=10.36};
: ${PKG_PCRE2_URL:=https://ftp.pcre.org/pub/pcre/pcre2-${PKG_PCRE2_VERSION}.tar.bz2};
: ${PKG_PCRE2_CONFIGURE_ARGS_EXTRA:="--enable-pcre2grep-libz --enable-pcre2grep-libbz2 --enable-pcre2-16 --enable-pcre2-32 --enable-jit"};
-: ${PKG_PHP_DEPENDS:="bzip2 libz libxml2 sqlite3 pcre2"};
-: ${PKG_PHP_SHA256SUM:=e9871d3b6c391fe9e89f86f6334852dcc10eeaaa8d5565beb8436e7f0cf30e20};
-: ${PKG_PHP_VERSION:=8.0.6};
+: ${PKG_PHP_DEPENDS:="bzip2 libz libxml2 sqlite3 pcre2 gmp"};
+: ${PKG_PHP_SHA256SUM:=dc1668d324232dec1d05175ec752dade92d29bb3004275118bc3f7fc7cbfbb1c};
+: ${PKG_PHP_VERSION:=8.0.8};
: ${PKG_PHP_URL:=https://www.php.net/distributions/php-${PKG_PHP_VERSION}.tar.xz};
-: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-zlib --with-external-pcre --with-bz2=${PREFIX_NATIVE} --disable-opcache --disable-phar"};
+: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-zlib --with-external-pcre --with-bz2=${PREFIX_NATIVE} --with-gmp --disable-opcache --disable-phar"};
: ${PKG_PHP_LIBTOOL:=rdlibtool};
: ${PKG_POPT_SHA256SUM:=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1};
: ${PKG_POPT_VERSION:=1.18};
diff --git a/patches/php-8.0.6_pre.local.patch b/patches/php-8.0.8_pre.local.patch
index 37b041b6..4cbf4179 100644
--- a/patches/php-8.0.6_pre.local.patch
+++ b/patches/php-8.0.8_pre.local.patch
@@ -1,3 +1,15 @@
+diff -ru php-8.0.8.orig/TSRM/TSRM.h php-8.0.8/TSRM/TSRM.h
+--- php-8.0.8.orig/TSRM/TSRM.h 2021-06-29 09:41:19.000000000 +0200
++++ php-8.0.8/TSRM/TSRM.h 2021-07-17 21:51:11.409950944 +0200
+@@ -147,7 +147,7 @@
+ # define __has_attribute(x) 0
+ #endif
+
+-#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__)
++#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__midipix__)
+ # define TSRM_TLS_MODEL_ATTR
+ #elif __PIC__
+ # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))
diff -ru php-8.0.1.orig/configure php-8.0.1/configure
--- php-8.0.1.orig/configure 2021-01-05 14:54:54.000000000 +0100
+++ php-8.0.1/configure 2021-01-13 23:01:56.427279925 +0100