Blame patches/php-8.1.20_pre.local.patch

7837e6
diff -ru php-8.1.10.orig/build/libtool.m4 php-8.1.10/build/libtool.m4
7837e6
--- php-8.1.10.orig/build/libtool.m4	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/build/libtool.m4	2023-04-01 22:20:57.477316107 +0200
7837e6
@@ -56,10 +56,6 @@
7837e6
 # This can be used to rebuild libtool when needed
7837e6
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
7837e6
 
7837e6
-# Always use our own libtool.
7837e6
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
7837e6
-AC_SUBST(LIBTOOL)dnl
7837e6
-
7837e6
 # Prevent multiple expansion
7837e6
 define([AC_PROG_LIBTOOL], [])
7837e6
 ])# _AC_PROG_LIBTOOL
7837e6
Only in php-8.1.10/build: libtool.m4.orig
d1bf7f
diff -ru php-8.1.10.orig/build/Makefile.global php-8.1.10/build/Makefile.global
7837e6
--- php-8.1.10.orig/build/Makefile.global	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/build/Makefile.global	2023-04-02 14:00:07.654373585 +0200
d1bf7f
@@ -11,9 +11,9 @@
7837e6
 	@echo "Don't forget to run 'make test'."
7837e6
 	@echo
7837e6
 
d1bf7f
-build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
d1bf7f
+build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp.la
7837e6
 
d1bf7f
-build-binaries: $(PHP_BINARIES)
d1bf7f
+build-binaries: $(PHP_BINARIES) libphp.la
7837e6
 
d1bf7f
 libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
7837e6
 	$(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
7837e6
@@ -26,7 +26,7 @@
7837e6
 
7837e6
 install-sapi: $(OVERALL_TARGET)
7837e6
 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
7837e6
-	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
7837e6
+	-@$(mkinstalldirs) $(DESTDIR)$(bindir)
7837e6
 	-@if test ! -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); then \
7837e6
 		for i in 0.0.0 0.0 0; do \
7837e6
 			if test -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
7837e6
@@ -41,19 +41,19 @@
7837e6
 
d1bf7f
 install-modules: build-modules
7837e6
 	@test -d modules && \
d1bf7f
-	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
d1bf7f
-	@echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/"
d1bf7f
+	$(mkinstalldirs) $(DESTDIR)$(EXTENSION_DIR)
d1bf7f
+	@echo "Installing shared extensions:     $(DESTDIR)$(EXTENSION_DIR)/"
7837e6
 	@rm -f modules/*.la >/dev/null 2>&1
d1bf7f
-	@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
d1bf7f
+	@$(INSTALL) modules/* $(DESTDIR)$(EXTENSION_DIR)
013bf2
 
7837e6
 install-headers:
7837e6
 	-@if test "$(INSTALL_HEADERS)"; then \
7837e6
 		for i in `echo $(INSTALL_HEADERS)`; do \
7837e6
 			i=`$(top_srcdir)/build/shtool path -d $$i`; \
7837e6
-			paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
7837e6
+			paths="$$paths $(DESTDIR)$(phpincludedir)/$$i"; \
7837e6
 		done; \
7837e6
 		$(mkinstalldirs) $$paths && \
7837e6
-		echo "Installing header files:          $(INSTALL_ROOT)$(phpincludedir)/" && \
7837e6
+		echo "Installing header files:          $(DESTDIR)$(phpincludedir)/" && \
7837e6
 		for i in `echo $(INSTALL_HEADERS)`; do \
7837e6
 			if test "$(PHP_PECL_EXTENSION)"; then \
7837e6
 				src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
7837e6
@@ -61,12 +61,12 @@
7837e6
 				src=$$i; \
7837e6
 			fi; \
7837e6
 			if test -f "$(top_srcdir)/$$src"; then \
7837e6
-				$(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
7837e6
+				$(INSTALL_DATA) $(top_srcdir)/$$src $(DESTDIR)$(phpincludedir)/$$i; \
7837e6
 			elif test -f "$(top_builddir)/$$src"; then \
7837e6
-				$(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
7837e6
+				$(INSTALL_DATA) $(top_builddir)/$$src $(DESTDIR)$(phpincludedir)/$$i; \
7837e6
 			else \
7837e6
-				(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \
7837e6
-				cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
7837e6
+				(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(DESTDIR)$(phpincludedir)/$$i; \
7837e6
+				cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(DESTDIR)$(phpincludedir)/$$i) 2>/dev/null || true; \
7837e6
 			fi \
7837e6
 		done; \
7837e6
 	fi
7837e6
diff -ru php-8.1.10.orig/configure php-8.1.10/configure
7837e6
--- php-8.1.10.orig/configure	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/configure	2023-04-02 14:03:31.975117895 +0200
7837e6
@@ -7015,13 +7015,13 @@
7837e6
     as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
7837e6
   fi
7837e6
 
7837e6
-  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
7837e6
+  APXS_LIBEXECDIR='$(DESTDIR)'`$APXS -q LIBEXECDIR`
7837e6
   if test -z `$APXS -q SYSCONFDIR`; then
7837e6
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
7837e6
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
7837e6
                        -i -n php"
7837e6
   else
7837e6
-    APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
7837e6
+    APXS_SYSCONFDIR='$(DESTDIR)'`$APXS -q SYSCONFDIR`
7837e6
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
7837e6
                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
7837e6
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
7837e6
@@ -7775,6 +7775,9 @@
f4e59e
   *darwin*)
f4e59e
     BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
f4e59e
     ;;
f4e59e
+  *midipix*)
013bf2
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH) \$(top_builddir)/libs/libphp.so"
f4e59e
+    ;;
f4e59e
   *)
f4e59e
     BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
f4e59e
     ;;
7837e6
@@ -7851,12 +7854,12 @@
7837e6
     yes|shared)
7837e6
       LIBPHP_CFLAGS="-shared"
7837e6
       PHP_EMBED_TYPE=shared
7837e6
-      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
7837e6
+      INSTALL_IT="\$(mkinstalldirs) \$(DESTDIR)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(DESTDIR)\$(prefix)/lib"
7837e6
       ;;
7837e6
     static)
7837e6
       LIBPHP_CFLAGS="-static"
7837e6
       PHP_EMBED_TYPE=static
7837e6
-      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0644 $SAPI_STATIC \$(INSTALL_ROOT)\$(prefix)/lib"
7837e6
+      INSTALL_IT="\$(mkinstalldirs) \$(DESTDIR)\$(prefix)/lib; \$(INSTALL) -m 0644 $SAPI_STATIC \$(DESTDIR)\$(prefix)/lib"
7837e6
       ;;
7837e6
     *)
7837e6
       PHP_EMBED_TYPE=no
7837e6
@@ -7979,7 +7982,7 @@
941e53
   php_sapi_module=static
941e53
 ;;
941e53
     esac
941e53
-    install_sapi="install-sapi"
941e53
+    install_sapi=""
7837e6
 
7837e6
 
941e53
   case sapi/embed in
7837e6
@@ -11470,14 +11473,12 @@
013bf2
 
f4e59e
   BUILD_PHPDBG="\$(LIBTOOL) --mode=link \
f4e59e
         \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
f4e59e
-                \$(PHP_GLOBAL_OBJS:.lo=.o) \
f4e59e
-                \$(PHP_BINARY_OBJS:.lo=.o) \
f4e59e
                 \$(PHP_PHPDBG_OBJS:.lo=.o) \
f4e59e
                 \$(EXTRA_LIBS) \
f4e59e
                 \$(PHPDBG_EXTRA_LIBS) \
f4e59e
                 \$(ZEND_EXTRA_LIBS) \
f4e59e
                 \$(PHP_FRAMEWORKS) \
f4e59e
-         -o \$(BUILD_BINARY)"
013bf2
+         -o \$(BUILD_BINARY) \$(top_builddir)/libs/libphp.so"
013bf2
 
f4e59e
   BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \
f4e59e
         \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
7837e6
@@ -11703,6 +11704,9 @@
f4e59e
       *darwin*)
f4e59e
         BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
f4e59e
       ;;
f4e59e
+      *midipix*)
013bf2
+        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH) \$(top_builddir)/libs/libphp.so"
f4e59e
+      ;;
f4e59e
       *)
f4e59e
         BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
f4e59e
       ;;
eb8bfc
@@ -12008,10 +12008,6 @@
eb8bfc
   fi
eb8bfc
eb8bfc
eb8bfc
-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
eb8bfc
-   CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
eb8bfc
-   LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
eb8bfc
-fi
eb8bfc
 test -d /usr/ucblib &&
eb8bfc
   if test "/usr/ucblib" != "/usr/$PHP_LIBDIR" && test "/usr/ucblib" != "/usr/lib"; then
eb8bfc
7837e6
@@ -21314,7 +21318,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/libxml.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/libxml.$suffix: \$(shared_objects_libxml) \$(LIBXML_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_libxml) \$(LIBXML_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_libxml) \$(LIBXML_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -21691,7 +21695,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/openssl.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/openssl.$suffix: \$(shared_objects_openssl) \$(OPENSSL_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_openssl) \$(OPENSSL_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_openssl) \$(OPENSSL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -22772,7 +22776,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/pcre.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/pcre.$suffix: \$(shared_objects_pcre) \$(PCRE_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_pcre) \$(PCRE_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_pcre) \$(PCRE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -24173,7 +24177,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sqlite3.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sqlite3.$suffix: \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -24719,7 +24723,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/zlib.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/zlib.$suffix: \$(shared_objects_zlib) \$(ZLIB_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zlib) \$(ZLIB_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zlib) \$(ZLIB_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -25036,7 +25040,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bcmath) \$(BCMATH_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bcmath) \$(BCMATH_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -25673,7 +25677,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bz2) \$(BZ2_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_bz2) \$(BZ2_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -25985,7 +25989,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_calendar) \$(CALENDAR_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_calendar) \$(CALENDAR_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -26294,7 +26298,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ctype) \$(CTYPE_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ctype) \$(CTYPE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -27344,7 +27348,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/curl.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/curl.$suffix: \$(shared_objects_curl) \$(CURL_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_curl) \$(CURL_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_curl) \$(CURL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -31697,7 +31701,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/dba.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/dba.$suffix: \$(shared_objects_dba) \$(DBA_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dba) \$(DBA_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dba) \$(DBA_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -32594,7 +32598,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/dom.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/dom.$suffix: \$(shared_objects_dom) \$(DOM_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dom) \$(DOM_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_dom) \$(DOM_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -34057,7 +34061,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/exif.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/exif.$suffix: \$(shared_objects_exif) \$(EXIF_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_exif) \$(EXIF_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_exif) \$(EXIF_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -35243,7 +35247,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/fileinfo.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/fileinfo.$suffix: \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -35575,7 +35579,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/filter.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/filter.$suffix: \$(shared_objects_filter) \$(FILTER_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_filter) \$(FILTER_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_filter) \$(FILTER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -35950,7 +35954,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/ftp.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/ftp.$suffix: \$(shared_objects_ftp) \$(FTP_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ftp) \$(FTP_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_ftp) \$(FTP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -41144,7 +41148,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/gettext.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/gettext.$suffix: \$(shared_objects_gettext) \$(GETTEXT_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_gettext) \$(GETTEXT_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_gettext) \$(GETTEXT_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -43812,7 +43816,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/iconv.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/iconv.$suffix: \$(shared_objects_iconv) \$(ICONV_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_iconv) \$(ICONV_SHARED_LIBADD)
dd9100
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_iconv) \$(ICONV_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-liconv
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -50165,7 +50169,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/mbstring.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/mbstring.$suffix: \$(shared_objects_mbstring) \$(MBSTRING_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mbstring) \$(MBSTRING_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mbstring) \$(MBSTRING_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -55345,7 +55349,16 @@
ada487
 printf %s "checking for sysvipc shared memory support... " >&6; }
ada487
   if test "$cross_compiling" = yes
ada487
 then :
ada487
-  have_shm_ipc=no
673e24
+
ada487
+  case $host_alias in
ada487
+    *midipix*)
ada487
+      have_shm_ipc=yes
ada487
+      ;;
ada487
+    *)
ada487
+      have_shm_ipc=no
ada487
+      ;;
ada487
+  esac
ada487
+
ada487
 else $as_nop
673e24
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ada487
 /* end confdefs.h.  */
7837e6
@@ -56221,7 +56234,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/opcache.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/opcache.$suffix: \$(shared_objects_opcache) \$(OPCACHE_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_opcache) \$(OPCACHE_SHARED_LIBADD)
1fbede
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_opcache) \$(OPCACHE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -65467,7 +65480,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_posix) \$(POSIX_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_posix) \$(POSIX_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -69010,7 +69023,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_readline) \$(READLINE_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_readline) \$(READLINE_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -69839,7 +69852,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_session) \$(SESSION_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_session) \$(SESSION_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -70376,7 +70389,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_shmop) \$(SHMOP_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_shmop) \$(SHMOP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -70928,7 +70941,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -72718,7 +72731,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_soap) \$(SOAP_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_soap) \$(SOAP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -73309,7 +73322,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sockets) \$(SOCKETS_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sockets) \$(SOCKETS_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -79177,7 +79190,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -79483,7 +79496,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -79840,7 +79853,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -81122,7 +81135,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -81966,7 +81979,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xml) \$(XML_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xml) \$(XML_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -82542,7 +82555,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -83118,7 +83131,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -83889,7 +83902,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xsl) \$(XSL_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xsl) \$(XSL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -84217,7 +84230,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/zend_test.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/zend_test.$suffix: \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -85749,7 +85762,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zip) \$(ZIP_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_zip) \$(ZIP_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lpcre2-8
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -86585,7 +86598,7 @@
013bf2
 	\$(LIBTOOL) --mode=install cp $ext_builddir/mysqlnd.$suffix \$(phplibdir)
013bf2
 
013bf2
 $ext_builddir/mysqlnd.$suffix: \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_DEPENDENCIES)
013bf2
-	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_LIBADD)
013bf2
+	\$(LIBTOOL) --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \-lcrypto \-lz
013bf2
 
013bf2
 EOF
013bf2
 
7837e6
@@ -86818,7 +86831,7 @@
673e24
 enable_static=yes
013bf2
 
673e24
 case $php_sapi_module in
673e24
-  shared)
673e24
+  *)
673e24
     if test "$PHP_CGI" = "no" && test "$PHP_CLI" = "no" && test "$PHP_FPM" = "no" && test "$PHP_LITESPEED" = "no" && test "$PHP_PHPDBG" = "no"; then
673e24
       enable_static=no
673e24
     fi
7837e6
@@ -86832,12 +86845,6 @@
673e24
     esac
673e24
     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
673e24
     ;;
673e24
-  *)
673e24
-    standard_libtool_flag='-prefer-non-pic -static'
673e24
-    if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
673e24
-      enable_shared=no
673e24
-    fi
673e24
-    ;;
673e24
 esac
013bf2
 
673e24
 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
7afd69
@@ -88221,6 +88221,8 @@
ada487
     fiber_os="mac" ;; #(
ada487
   aix*|os400*) :
ada487
     fiber_os="aix" ;; #(
ada487
+  midipix*) :
ada487
+    fiber_os="midipix" ;; #(
7afd69
   freebsd*) :
7afd69
     fiber_os="freebsd" ;; #(
ada487
   *) :
7837e6
@@ -87039,6 +87048,8 @@
ada487
 
ada487
 if test "$fiber_os" = 'mac'; then
ada487
   fiber_asm_file="combined_sysv_macho_gas"
ada487
+elif test "$fiber_os" = 'midipix'; then
ada487
+  fiber_asm_file="x86_64_ms_pe_gas"
ada487
 elif test "$fiber_os" = 'aix'; then
ada487
   # AIX uses a different calling convention (shared with non-_CALL_ELF Linux).
ada487
   # The AIX assembler isn't GNU, but the file is compatible.
7837e6
@@ -87113,8 +87124,14 @@
ada487
 if test "x$ac_cv_header_ucontext_h" = xyes
ada487
 then :
ada487
 
ada487
-
ada487
-printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
ada487
+  case $host_alias in
ada487
+    *midipix*)
ada487
+      # not supported
ada487
+      ;;
ada487
+    *)
ada487
+      printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
ada487
+      ;;
ada487
+  esac
ada487
 
ada487
 
ada487
 else $as_nop
7837e6
@@ -91081,7 +91098,7 @@
673e24
       lt_prog_compiler_static='-Bstatic'
673e24
       ;;
013bf2
 
673e24
-    linux* | k*bsd*-gnu)
673e24
+    linux* | k*bsd*-gnu | midipix*)
673e24
       case $cc_basename in
673e24
       # old Intel for x86_64 which still supported -KPIC.
673e24
       ecc*)
7837e6
@@ -92801,6 +92818,17 @@
673e24
   dynamic_linker='GNU/Linux ld.so'
673e24
   ;;
673e24
 
673e24
+midipix*)
673e24
+  version_type=linux # correct to gnu/linux during the next big refactor
673e24
+  need_lib_prefix=no
673e24
+  need_version=no
673e24
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
673e24
+  soname_spec='$libname$release$shared_ext$major'
673e24
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
673e24
+  shlibpath_var=LD_LIBRARY_PATH
673e24
+  dynamic_linker='GNU/Linux ld.so'
673e24
+  ;;
673e24
+
673e24
 netbsd*)
673e24
   version_type=sunos
673e24
   need_lib_prefix=no
7837e6
@@ -94872,7 +94900,7 @@
673e24
     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
673e24
     hardcode_libdir_separator_CXX=:
673e24
     ;;
673e24
-  linux* | k*bsd*-gnu)
673e24
+  linux* | k*bsd*-gnu | midipix*)
673e24
     case $cc_basename in
673e24
       KCC*)
013bf2
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
7837e6
diff -ru php-8.1.10.orig/ext/pdo/Makefile.frag php-8.1.10/ext/pdo/Makefile.frag
7837e6
--- php-8.1.10.orig/ext/pdo/Makefile.frag	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/ext/pdo/Makefile.frag	2023-04-02 14:01:59.387117333 +0200
7837e6
@@ -15,17 +15,17 @@
7837e6
 	fi)
7837e6
 
7837e6
 install-pdo-headers:
7837e6
-	@echo "Installing PDO headers:           $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/pdo
7837e6
+	@echo "Installing PDO headers:           $(DESTDIR)$(phpincludedir)/ext/pdo/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(phpincludedir)/ext/pdo
7837e6
 	@for f in $(PDO_HEADER_FILES); do \
7837e6
 		if test -f "$(top_srcdir)/$$f"; then \
7837e6
-			$(INSTALL_DATA) $(top_srcdir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \
7837e6
+			$(INSTALL_DATA) $(top_srcdir)/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \
7837e6
 		elif test -f "$(top_builddir)/$$f"; then \
7837e6
-			$(INSTALL_DATA) $(top_builddir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \
7837e6
+			$(INSTALL_DATA) $(top_builddir)/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \
7837e6
 		elif test -f "$(top_srcdir)/ext/pdo/$$f"; then \
7837e6
-			$(INSTALL_DATA) $(top_srcdir)/ext/pdo/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \
7837e6
+			$(INSTALL_DATA) $(top_srcdir)/ext/pdo/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \
7837e6
 		elif test -f "$(top_builddir)/ext/pdo/$$f"; then \
7837e6
-			$(INSTALL_DATA) $(top_builddir)/ext/pdo/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \
7837e6
+			$(INSTALL_DATA) $(top_builddir)/ext/pdo/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \
7837e6
 		else \
7837e6
 			echo "hmmm"; \
7837e6
 		fi \
7837e6
diff -ru php-8.1.10.orig/ext/phar/Makefile.frag php-8.1.10/ext/phar/Makefile.frag
7837e6
--- php-8.1.10.orig/ext/phar/Makefile.frag	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/ext/phar/Makefile.frag	2023-04-02 13:55:10.502990879 +0200
7837e6
@@ -23,7 +23,7 @@
7837e6
 	else \
7837e6
 		$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
7837e6
 	fi;`
7837e6
-PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
7837e6
+PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(DESTDIR)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
7837e6
 
7837e6
 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
7837e6
 	-@test -d $(builddir)/phar || mkdir $(builddir)/phar
7837e6
diff -ru php-8.1.10.orig/pear/Makefile.frag php-8.1.10/pear/Makefile.frag
7837e6
--- php-8.1.10.orig/pear/Makefile.frag	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/pear/Makefile.frag	2023-04-02 14:01:35.683117189 +0200
7837e6
@@ -13,7 +13,7 @@
7837e6
 	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
7837e6
 
7837e6
 install-pear:
7837e6
-	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
7837e6
+	@echo "Installing PEAR environment:      $(DESTDIR)$(peardir)/"
7837e6
 	@if test ! -f $(builddir)/install-pear-nozlib.phar; then \
7837e6
 		if test -f $(srcdir)/install-pear-nozlib.phar; then \
7837e6
 			cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
7837e6
@@ -27,7 +27,7 @@
7837e6
 			fi \
7837e6
 		fi \
7837e6
 	fi
7837e6
-	@if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
7837e6
+	@if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(DESTDIR)$(peardir); then \
7837e6
 		$(MAKE) -s install-pear-installer; \
7837e6
 	else \
7837e6
 		cat $(srcdir)/install-pear.txt; \
7837e6
diff -ru php-8.1.10.orig/sapi/cgi/Makefile.frag php-8.1.10/sapi/cgi/Makefile.frag
7837e6
--- php-8.1.10.orig/sapi/cgi/Makefile.frag	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/sapi/cgi/Makefile.frag	2023-04-02 13:49:14.959756178 +0200
7837e6
@@ -4,9 +4,9 @@
7837e6
 	$(BUILD_CGI)
7837e6
 
673e24
 install-cgi: $(SAPI_CGI_PATH)
7837e6
-	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
673e24
-	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
7837e6
-	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
7837e6
-	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
7837e6
+	@echo "Installing PHP CGI binary:        $(DESTDIR)$(bindir)/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(bindir)
7837e6
+	@$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(DESTDIR)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
7837e6
+	@echo "Installing PHP CGI man page:      $(DESTDIR)$(mandir)/man1/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
7837e6
+	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
7837e6
diff -ru php-8.1.10.orig/sapi/cli/Makefile.frag php-8.1.10/sapi/cli/Makefile.frag
7837e6
--- php-8.1.10.orig/sapi/cli/Makefile.frag	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/sapi/cli/Makefile.frag	2023-04-01 22:20:57.477316107 +0200
7837e6
@@ -4,9 +4,9 @@
7837e6
 	$(BUILD_CLI)
7837e6
 
7837e6
 install-cli: $(SAPI_CLI_PATH)
7837e6
-	@echo "Installing PHP CLI binary:        $(INSTALL_ROOT)$(bindir)/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
7837e6
-	@$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
7837e6
-	@echo "Installing PHP CLI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
7837e6
-	@$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
7837e6
+	@echo "Installing PHP CLI binary:        $(DESTDIR)$(bindir)/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(bindir)
7837e6
+	@$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(DESTDIR)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
7837e6
+	@echo "Installing PHP CLI man page:      $(DESTDIR)$(mandir)/man1/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
7837e6
+	@$(INSTALL_DATA) sapi/cli/php.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
7837e6
diff -ru php-8.1.10.orig/sapi/fpm/Makefile.frag php-8.1.10/sapi/fpm/Makefile.frag
7837e6
--- php-8.1.10.orig/sapi/fpm/Makefile.frag	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/sapi/fpm/Makefile.frag	2023-04-02 13:51:05.086989390 +0200
7837e6
@@ -4,25 +4,25 @@
7837e6
 	$(BUILD_FPM)
7837e6
 
7837e6
 install-fpm: $(SAPI_FPM_PATH)
7837e6
-	@echo "Installing PHP FPM binary:        $(INSTALL_ROOT)$(sbindir)/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir)
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
7837e6
-	@$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
7837e6
+	@echo "Installing PHP FPM binary:        $(DESTDIR)$(sbindir)/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(sbindir)
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
7837e6
+	@$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(DESTDIR)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
7837e6
 
7837e6
-	@if test -f "$(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf"; then \
7837e6
+	@if test -f "$(DESTDIR)$(sysconfdir)/php-fpm.conf"; then \
7837e6
 		echo "Installing PHP FPM defconfig:     skipping"; \
7837e6
 	else \
7837e6
-		echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
7837e6
-		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
7837e6
-		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
7837e6
-		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
7837e6
+		echo "Installing PHP FPM defconfig:     $(DESTDIR)$(sysconfdir)/" && \
7837e6
+		$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/php-fpm.d; \
7837e6
+		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(DESTDIR)$(sysconfdir)/php-fpm.conf.default; \
7837e6
+		$(INSTALL_DATA) sapi/fpm/www.conf $(DESTDIR)$(sysconfdir)/php-fpm.d/www.conf.default; \
7837e6
 	fi
7837e6
 
7837e6
-	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
7837e6
-	@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8
7837e6
+	@echo "Installing PHP FPM man page:      $(DESTDIR)$(mandir)/man8/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
7837e6
+	@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(DESTDIR)$(mandir)/man8/php-fpm$(program_suffix).8
7837e6
 
7837e6
-	@echo "Installing PHP FPM status page:   $(INSTALL_ROOT)$(datadir)/fpm/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm
7837e6
-	@$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html
7837e6
+	@echo "Installing PHP FPM status page:   $(DESTDIR)$(datadir)/fpm/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(datadir)/fpm
7837e6
+	@$(INSTALL_DATA) sapi/fpm/status.html $(DESTDIR)$(datadir)/fpm/status.html
7837e6
diff -ru php-8.1.10.orig/sapi/litespeed/Makefile.frag php-8.1.10/sapi/litespeed/Makefile.frag
7837e6
--- php-8.1.10.orig/sapi/litespeed/Makefile.frag	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/sapi/litespeed/Makefile.frag	2023-04-02 14:02:49.307117636 +0200
7837e6
@@ -4,6 +4,6 @@
7837e6
 	$(BUILD_LITESPEED)
7837e6
 
7837e6
 install-litespeed: $(SAPI_LITESPEED_PATH)
7837e6
-	@echo "Installing PHP LiteSpeed binary:  $(INSTALL_ROOT)$(bindir)/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
7837e6
-	@$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)lsphp$(program_suffix)
7837e6
+	@echo "Installing PHP LiteSpeed binary:  $(DESTDIR)$(bindir)/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(bindir)
7837e6
+	@$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(DESTDIR)$(bindir)/$(program_prefix)lsphp$(program_suffix)
7837e6
diff -ru php-8.1.10.orig/sapi/phpdbg/Makefile.frag php-8.1.10/sapi/phpdbg/Makefile.frag
7837e6
--- php-8.1.10.orig/sapi/phpdbg/Makefile.frag	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/sapi/phpdbg/Makefile.frag	2023-04-01 22:20:57.493316108 +0200
3811f1
@@ -21,11 +21,11 @@
3811f1
 	@$(YACC) $(YFLAGS) -v -d $(srcdir)/phpdbg_parser.y -o $@
3811f1
 
3811f1
 install-phpdbg: $(BUILD_BINARY)
3811f1
-	@echo "Installing phpdbg binary:         $(INSTALL_ROOT)$(bindir)/"
3811f1
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
3811f1
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
3811f1
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
673e24
-	@$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
3811f1
-	@echo "Installing phpdbg man page:       $(INSTALL_ROOT)$(mandir)/man1/"
3811f1
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
3811f1
-	@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
3811f1
+	@echo "Installing phpdbg binary:         $(DESTDIR)$(bindir)/"
3811f1
+	@$(mkinstalldirs) $(DESTDIR)$(bindir)
3811f1
+	@$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
3811f1
+	@$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
3811f1
+	@$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(DESTDIR)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
3811f1
+	@echo "Installing phpdbg man page:       $(DESTDIR)$(mandir)/man1/"
3811f1
+	@$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
3811f1
+	@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
7837e6
diff -ru php-8.1.10.orig/scripts/Makefile.frag php-8.1.10/scripts/Makefile.frag
7837e6
--- php-8.1.10.orig/scripts/Makefile.frag	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/scripts/Makefile.frag	2023-04-02 13:59:06.826373216 +0200
7837e6
@@ -27,24 +27,24 @@
7837e6
 man_PAGES = phpize php-config
7837e6
 
7837e6
 install-build:
7837e6
-	@echo "Installing build environment:     $(INSTALL_ROOT)$(phpbuilddir)/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \
7837e6
+	@echo "Installing build environment:     $(DESTDIR)$(phpbuilddir)/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(phpbuilddir) $(DESTDIR)$(bindir) && \
7837e6
 	(cd $(top_srcdir) && \
7837e6
-	$(INSTALL) $(BUILD_FILES_EXEC) $(INSTALL_ROOT)$(phpbuilddir) && \
7837e6
-	$(INSTALL_DATA) $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir))
7837e6
+	$(INSTALL) $(BUILD_FILES_EXEC) $(DESTDIR)$(phpbuilddir) && \
7837e6
+	$(INSTALL_DATA) $(BUILD_FILES) $(DESTDIR)$(phpbuilddir))
7837e6
 
7837e6
 install-programs: $(builddir)/phpize $(builddir)/php-config
7837e6
-	@echo "Installing helper programs:       $(INSTALL_ROOT)$(bindir)/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
7837e6
+	@echo "Installing helper programs:       $(DESTDIR)$(bindir)/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(bindir)
7837e6
 	@for prog in $(bin_SCRIPTS); do \
7837e6
 		echo "  program: $(program_prefix)$${prog}$(program_suffix)"; \
7837e6
-		$(INSTALL) -m 755 $(builddir)/$${prog} $(INSTALL_ROOT)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \
7837e6
+		$(INSTALL) -m 755 $(builddir)/$${prog} $(DESTDIR)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \
7837e6
 	done
7837e6
-	@echo "Installing man pages:             $(INSTALL_ROOT)$(mandir)/man1/"
7837e6
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
7837e6
+	@echo "Installing man pages:             $(DESTDIR)$(mandir)/man1/"
7837e6
+	@$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
7837e6
 	@for page in $(man_PAGES); do \
7837e6
 		echo "  page: $(program_prefix)$${page}$(program_suffix).1"; \
7837e6
-		$(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
7837e6
+		$(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
7837e6
 	done
7837e6
 
7837e6
 $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
7837e6
diff -ru php-8.1.10.orig/TSRM/TSRM.h php-8.1.10/TSRM/TSRM.h
7837e6
--- php-8.1.10.orig/TSRM/TSRM.h	2022-08-30 18:09:36.000000000 +0200
7837e6
+++ php-8.1.10/TSRM/TSRM.h	2023-04-01 22:20:57.493316108 +0200
013bf2
@@ -147,7 +147,7 @@
013bf2
 # define __has_attribute(x) 0
013bf2
 #endif
013bf2
 
29496b
-#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__)
29496b
+#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__) || defined(__midipix__)
013bf2
 # define TSRM_TLS_MODEL_ATTR
013bf2
 #elif __PIC__
013bf2
 # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))
7837e6
Only in php-8.1.10/TSRM: TSRM.h.orig