summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2022-03-26 12:45:00 +0100
committerØrjan Malde <red@foxi.me>2022-03-26 12:45:00 +0100
commit29496bf04738f0c42a0c8aeb4e74e65ed6c3d1dc (patch)
treea388a3337fc54fd30b061f74af0ac65c7d283631
parent68795f3c8e1d6da9c820c80149567fe950b75056 (diff)
downloadmidipix_build-29496bf04738f0c42a0c8aeb4e74e65ed6c3d1dc.tar.bz2
midipix_build-29496bf04738f0c42a0c8aeb4e74e65ed6c3d1dc.tar.xz
groups/231.native_packages_etc.group: php: bump to v8.1.4
Signed-off-by: Ørjan Malde <red@foxi.me>
-rw-r--r--groups/231.native_packages_etc.group4
-rw-r--r--patches/php-8.1.4_pre.local.patch (renamed from patches/php-8.1.3_pre.local.patch)4
2 files changed, 4 insertions, 4 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 3275df9..c3b4451 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -377,8 +377,8 @@ gl_cv_func_getopt_gnu=yes"};
: ${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 curl libz libzip libxml2 sqlite3 pcre2 readline libressl onig libiconv"};
-: ${PKG_PHP_SHA256SUM:=5d65a11071b47669c17452fb336c290b67c101efb745c1dbe7525b5caf546ec6};
-: ${PKG_PHP_VERSION:=8.1.3};
+: ${PKG_PHP_SHA256SUM:=05a8c0ac30008154fb38a305560543fc172ba79fb957084a99b8d3b10d5bdb4b};
+: ${PKG_PHP_VERSION:=8.1.4};
: ${PKG_PHP_URL:=https://www.php.net/distributions/php-${PKG_PHP_VERSION}.tar.xz};
: ${PKG_PHP_CONFIG_CACHE_EXTRA:="
ac_cv_c_bigendian_php=no
diff --git a/patches/php-8.1.3_pre.local.patch b/patches/php-8.1.4_pre.local.patch
index fc10b05..dda9bf5 100644
--- a/patches/php-8.1.3_pre.local.patch
+++ b/patches/php-8.1.4_pre.local.patch
@@ -562,8 +562,8 @@ diff -Nru php-8.1.0.orig/TSRM/TSRM.h php-8.1.0/TSRM/TSRM.h
# 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__)
+-#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__)
++#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__) || defined(__midipix__)
# define TSRM_TLS_MODEL_ATTR
#elif __PIC__
# define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))