From d302f5318364c429c7469fff14c40eb88d0a89d7 Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Jul 17 2021 20:25:23 +0000
Subject: groups/231.native_packages_etc.group: php: bump to v8.0.8


Signed-off-by: Ørjan Malde <red@foxi.me>

---

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index d1a7782..c98fe46 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.6_pre.local.patch
deleted file mode 100644
index 37b041b..0000000
--- a/patches/php-8.0.6_pre.local.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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
-@@ -52030,8 +52030,11 @@
- $as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; }
-   if test "$cross_compiling" = yes; then :
- 
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-+$as_echo "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: cross-compiling, assuming yes" >&5
-+$as_echo "cross-compiling, assuming yes" >&6; }
-+    have_shm_mmap_posix=yes
- 
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -87098,6 +87101,16 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+midipix*)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+  soname_spec='$libname$release$shared_ext$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-diff -ru php-8.0.1.orig/sapi/cgi/Makefile.frag php-8.0.1/sapi/cgi/Makefile.frag
---- php-8.0.1.orig/sapi/cgi/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
-+++ php-8.0.1/sapi/cgi/Makefile.frag	2021-01-14 00:20:44.769574312 +0100
-@@ -6,7 +6,7 @@
- install-cgi: $(SAPI_CGI_PATH)
- 	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
--	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
-+	@$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
- 	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- 	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
-diff -ru php-8.0.1.orig/sapi/cli/Makefile.frag php-8.0.1/sapi/cli/Makefile.frag
---- php-8.0.1.orig/sapi/cli/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
-+++ php-8.0.1/sapi/cli/Makefile.frag	2021-01-14 00:48:00.415700667 +0100
-@@ -6,7 +6,7 @@
- install-cli: $(SAPI_CLI_PATH)
- 	@echo "Installing PHP CLI binary:        $(INSTALL_ROOT)$(bindir)/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
--	@$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
-+	@$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
- 	@echo "Installing PHP CLI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- 	@$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
-diff -ru php-8.0.1.orig/sapi/phpdbg/Makefile.frag php-8.0.1/sapi/phpdbg/Makefile.frag
---- php-8.0.1.orig/sapi/phpdbg/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
-+++ php-8.0.1/sapi/phpdbg/Makefile.frag	2021-01-14 00:35:57.023625462 +0100
-@@ -25,7 +25,7 @@
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
--	@$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
-+	@$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
- 	@echo "Installing phpdbg man page:       $(INSTALL_ROOT)$(mandir)/man1/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- 	@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
diff --git a/patches/php-8.0.8_pre.local.patch b/patches/php-8.0.8_pre.local.patch
new file mode 100644
index 0000000..4cbf417
--- /dev/null
+++ b/patches/php-8.0.8_pre.local.patch
@@ -0,0 +1,82 @@
+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
+@@ -52030,8 +52030,11 @@
+ $as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; }
+   if test "$cross_compiling" = yes; then :
+ 
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++$as_echo "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: cross-compiling, assuming yes" >&5
++$as_echo "cross-compiling, assuming yes" >&6; }
++    have_shm_mmap_posix=yes
+ 
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -87098,6 +87101,16 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++midipix*)
++  version_type=linux # correct to gnu/linux during the next big refactor
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+diff -ru php-8.0.1.orig/sapi/cgi/Makefile.frag php-8.0.1/sapi/cgi/Makefile.frag
+--- php-8.0.1.orig/sapi/cgi/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
++++ php-8.0.1/sapi/cgi/Makefile.frag	2021-01-14 00:20:44.769574312 +0100
+@@ -6,7 +6,7 @@
+ install-cgi: $(SAPI_CGI_PATH)
+ 	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+-	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
++	@$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
+ 	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
+ 	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
+diff -ru php-8.0.1.orig/sapi/cli/Makefile.frag php-8.0.1/sapi/cli/Makefile.frag
+--- php-8.0.1.orig/sapi/cli/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
++++ php-8.0.1/sapi/cli/Makefile.frag	2021-01-14 00:48:00.415700667 +0100
+@@ -6,7 +6,7 @@
+ install-cli: $(SAPI_CLI_PATH)
+ 	@echo "Installing PHP CLI binary:        $(INSTALL_ROOT)$(bindir)/"
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+-	@$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
++	@$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
+ 	@echo "Installing PHP CLI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
+ 	@$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
+diff -ru php-8.0.1.orig/sapi/phpdbg/Makefile.frag php-8.0.1/sapi/phpdbg/Makefile.frag
+--- php-8.0.1.orig/sapi/phpdbg/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
++++ php-8.0.1/sapi/phpdbg/Makefile.frag	2021-01-14 00:35:57.023625462 +0100
+@@ -25,7 +25,7 @@
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
+-	@$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
++	@$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
+ 	@echo "Installing phpdbg man page:       $(INSTALL_ROOT)$(mandir)/man1/"
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
+ 	@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1