|
 |
d302f5 |
diff -ru php-8.0.8.orig/TSRM/TSRM.h php-8.0.8/TSRM/TSRM.h
|
|
|
d302f5 |
--- php-8.0.8.orig/TSRM/TSRM.h 2021-06-29 09:41:19.000000000 +0200
|
|
|
d302f5 |
+++ php-8.0.8/TSRM/TSRM.h 2021-07-17 21:51:11.409950944 +0200
|
|
|
d302f5 |
@@ -147,7 +147,7 @@
|
|
|
d302f5 |
# define __has_attribute(x) 0
|
|
|
d302f5 |
#endif
|
|
|
d302f5 |
|
|
|
d302f5 |
-#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__)
|
|
|
d302f5 |
+#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__midipix__)
|
|
|
d302f5 |
# define TSRM_TLS_MODEL_ATTR
|
|
|
d302f5 |
#elif __PIC__
|
|
|
d302f5 |
# define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))
|
|
|
6fe1f5 |
diff -ru php-8.0.1.orig/configure php-8.0.1/configure
|
|
|
6fe1f5 |
--- php-8.0.1.orig/configure 2021-01-05 14:54:54.000000000 +0100
|
|
|
6fe1f5 |
+++ php-8.0.1/configure 2021-01-13 23:01:56.427279925 +0100
|
|
|
6fe1f5 |
@@ -52030,8 +52030,11 @@
|
|
|
6fe1f5 |
$as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; }
|
|
|
6fe1f5 |
if test "$cross_compiling" = yes; then :
|
|
|
6fe1f5 |
|
|
|
6fe1f5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
6fe1f5 |
-$as_echo "no" >&6; }
|
|
|
6fe1f5 |
+$as_echo "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
|
|
|
6fe1f5 |
+
|
|
|
6fe1f5 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: cross-compiling, assuming yes" >&5
|
|
|
6fe1f5 |
+$as_echo "cross-compiling, assuming yes" >&6; }
|
|
|
6fe1f5 |
+ have_shm_mmap_posix=yes
|
|
|
6fe1f5 |
|
|
|
6fe1f5 |
else
|
|
|
6fe1f5 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
6fe1f5 |
@@ -87098,6 +87101,16 @@
|
|
|
6fe1f5 |
dynamic_linker='GNU/Linux ld.so'
|
|
|
6fe1f5 |
;;
|
|
|
6fe1f5 |
|
|
|
6fe1f5 |
+midipix*)
|
|
|
6fe1f5 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
6fe1f5 |
+ need_lib_prefix=no
|
|
|
6fe1f5 |
+ need_version=no
|
|
|
6fe1f5 |
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
|
|
6fe1f5 |
+ soname_spec='$libname$release$shared_ext$major'
|
|
|
6fe1f5 |
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
|
|
6fe1f5 |
+ shlibpath_var=LD_LIBRARY_PATH
|
|
|
6fe1f5 |
+ ;;
|
|
|
6fe1f5 |
+
|
|
|
6fe1f5 |
netbsd*)
|
|
|
6fe1f5 |
version_type=sunos
|
|
|
6fe1f5 |
need_lib_prefix=no
|
|
|
6fe1f5 |
diff -ru php-8.0.1.orig/sapi/cgi/Makefile.frag php-8.0.1/sapi/cgi/Makefile.frag
|
|
|
6fe1f5 |
--- php-8.0.1.orig/sapi/cgi/Makefile.frag 2021-01-05 14:54:54.000000000 +0100
|
|
|
6fe1f5 |
+++ php-8.0.1/sapi/cgi/Makefile.frag 2021-01-14 00:20:44.769574312 +0100
|
|
|
6fe1f5 |
@@ -6,7 +6,7 @@
|
|
|
6fe1f5 |
install-cgi: $(SAPI_CGI_PATH)
|
|
|
6fe1f5 |
@echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
|
|
|
6fe1f5 |
@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
|
|
|
6fe1f5 |
- @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
|
|
|
6fe1f5 |
+ @$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
|
|
|
6fe1f5 |
@echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/"
|
|
|
6fe1f5 |
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
|
|
|
6fe1f5 |
@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
|
|
|
6fe1f5 |
diff -ru php-8.0.1.orig/sapi/cli/Makefile.frag php-8.0.1/sapi/cli/Makefile.frag
|
|
|
6fe1f5 |
--- php-8.0.1.orig/sapi/cli/Makefile.frag 2021-01-05 14:54:54.000000000 +0100
|
|
|
6fe1f5 |
+++ php-8.0.1/sapi/cli/Makefile.frag 2021-01-14 00:48:00.415700667 +0100
|
|
|
6fe1f5 |
@@ -6,7 +6,7 @@
|
|
|
6fe1f5 |
install-cli: $(SAPI_CLI_PATH)
|
|
|
6fe1f5 |
@echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/"
|
|
|
6fe1f5 |
@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
|
|
|
6fe1f5 |
- @$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
|
|
|
6fe1f5 |
+ @$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
|
|
|
6fe1f5 |
@echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/"
|
|
|
6fe1f5 |
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
|
|
|
6fe1f5 |
@$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
|
|
|
6fe1f5 |
diff -ru php-8.0.1.orig/sapi/phpdbg/Makefile.frag php-8.0.1/sapi/phpdbg/Makefile.frag
|
|
|
6fe1f5 |
--- php-8.0.1.orig/sapi/phpdbg/Makefile.frag 2021-01-05 14:54:54.000000000 +0100
|
|
|
6fe1f5 |
+++ php-8.0.1/sapi/phpdbg/Makefile.frag 2021-01-14 00:35:57.023625462 +0100
|
|
|
6fe1f5 |
@@ -25,7 +25,7 @@
|
|
|
6fe1f5 |
@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
|
|
|
6fe1f5 |
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
|
|
|
6fe1f5 |
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
|
|
|
6fe1f5 |
- @$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
|
|
|
6fe1f5 |
+ @$(LIBTOOL) --mode=install cp $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
|
|
|
6fe1f5 |
@echo "Installing phpdbg man page: $(INSTALL_ROOT)$(mandir)/man1/"
|
|
|
6fe1f5 |
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
|
|
|
6fe1f5 |
@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
|