Blame patches/php-8.0.11_pre.local.patch

673e24
diff -ru php-8.0.11.orig/build/ php-8.0.11/build/libtool.m4
673e24
--- php-8.0.11.orig/build/libtool.m4    2021-09-21 19:07:44.000000000 +0200
673e24
+++ php-8.0.11/build/libtool.m4 2021-09-29 22:21:23.610917784 +0200
673e24
@@ -56,10 +56,6 @@
673e24
 # This can be used to rebuild libtool when needed
673e24
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
673e24
673e24
-# Always use our own libtool.
673e24
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
673e24
-AC_SUBST(LIBTOOL)dnl
673e24
-
673e24
 # Prevent multiple expansion
673e24
 define([AC_PROG_LIBTOOL], [])
673e24
 ])# _AC_PROG_LIBTOOL
673e24
diff -ru php-8.0.8.orig/TSRM/TSRM.h php-8.0.8/TSRM/TSRM.h
673e24
--- php-8.0.8.orig/TSRM/TSRM.h  2021-06-29 09:41:19.000000000 +0200
673e24
+++ php-8.0.8/TSRM/TSRM.h       2021-07-17 21:51:11.409950944 +0200
673e24
@@ -147,7 +147,7 @@
673e24
 # define __has_attribute(x) 0
673e24
 #endif
673e24
673e24
-#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__)
673e24
+#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__midipix__)
673e24
 # define TSRM_TLS_MODEL_ATTR
673e24
 #elif __PIC__
673e24
 # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))
673e24
diff -ru php-8.0.1.orig/configure php-8.0.1/configure
673e24
--- php-8.0.1.orig/configure	2021-01-05 14:54:54.000000000 +0100
673e24
+++ php-8.0.1/configure	2021-01-13 23:01:56.427279925 +0100
673e24
@@ -52030,8 +52030,11 @@
673e24
 $as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; }
673e24
   if test "$cross_compiling" = yes; then :
673e24
 
673e24
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
673e24
-$as_echo "no" >&6; }
673e24
+$as_echo "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
673e24
+
673e24
+    { $as_echo "$as_me:${as_lineno-$LINENO}: cross-compiling, assuming yes" >&5
673e24
+$as_echo "cross-compiling, assuming yes" >&6; }
673e24
+    have_shm_mmap_posix=yes
673e24
 
673e24
 else
673e24
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
673e24
@@ -81688,7 +81691,7 @@
673e24
 enable_static=yes
673e24
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
673e24
@@ -81702,12 +81705,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
673e24
673e24
 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
673e24
@@ -85405,7 +85408,7 @@
673e24
       lt_prog_compiler_static='-Bstatic'
673e24
       ;;
673e24
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*)
673e24
@@ -87098,6 +87101,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
673e24
@@ -89172,7 +89185,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*)
673e24
        # Kuck and Associates, Inc. (KAI) C++ Compiler
673e24
@@ -91441,37 +91448,6 @@
673e24
 # This can be used to rebuild libtool when needed
673e24
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
673e24
673e24
-# Always use our own libtool.
673e24
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
673e24
-
673e24
-# Prevent multiple expansion
673e24
-
673e24
-
673e24
-
673e24
-
673e24
-
673e24
-
673e24
-
673e24
-
673e24
-
673e24
-
673e24
-
673e24
-
673e24
-  if test -z "$LIBTOOL"; then
673e24
-    LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
673e24
-  else
673e24
-    LIBTOOL="$LIBTOOL --silent"
673e24
-  fi
673e24
-
673e24
-
673e24
-
673e24
-  if test -z "$LIBTOOL"; then
673e24
-    LIBTOOL='$(SHELL) $(top_builddir)/libtool --preserve-dup-deps'
673e24
-  else
673e24
-    LIBTOOL="$LIBTOOL --preserve-dup-deps"
673e24
-  fi
673e24
-
673e24
-
673e24
 test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
673e24
 test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
673e24
 SHARED_LIBTOOL='$(LIBTOOL)'
673e24
diff -ru php-8.0.1.orig/sapi/cgi/Makefile.frag php-8.0.1/sapi/cgi/Makefile.frag
673e24
--- php-8.0.1.orig/sapi/cgi/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
673e24
+++ php-8.0.1/sapi/cgi/Makefile.frag	2021-01-14 00:20:44.769574312 +0100
673e24
@@ -6,7 +6,7 @@
673e24
 install-cgi: $(SAPI_CGI_PATH)
673e24
 	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
673e24
-	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
673e24
+	@$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
673e24
 	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
673e24
 	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
673e24
diff -ru php-8.0.1.orig/sapi/cli/Makefile.frag php-8.0.1/sapi/cli/Makefile.frag
673e24
--- php-8.0.1.orig/sapi/cli/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
673e24
+++ php-8.0.1/sapi/cli/Makefile.frag	2021-01-14 00:48:00.415700667 +0100
673e24
@@ -6,7 +6,7 @@
673e24
 install-cli: $(SAPI_CLI_PATH)
673e24
 	@echo "Installing PHP CLI binary:        $(INSTALL_ROOT)$(bindir)/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
673e24
-	@$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
673e24
+	@$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
673e24
 	@echo "Installing PHP CLI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
673e24
 	@$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
673e24
diff -ru php-8.0.1.orig/sapi/phpdbg/Makefile.frag php-8.0.1/sapi/phpdbg/Makefile.frag
673e24
--- php-8.0.1.orig/sapi/phpdbg/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
673e24
+++ php-8.0.1/sapi/phpdbg/Makefile.frag	2021-01-14 00:35:57.023625462 +0100
673e24
@@ -25,7 +25,7 @@
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
673e24
-	@$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
673e24
+	@$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
673e24
 	@echo "Installing phpdbg man page:       $(INSTALL_ROOT)$(mandir)/man1/"
673e24
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
673e24
 	@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1