diff options
| -rw-r--r-- | php-8.0.0-static.patch | 114 | ||||
| -rw-r--r-- | php.spec | 13 |
2 files changed, 124 insertions, 3 deletions
diff --git a/php-8.0.0-static.patch b/php-8.0.0-static.patch new file mode 100644 index 0000000..3e30292 --- /dev/null +++ b/php-8.0.0-static.patch @@ -0,0 +1,114 @@ +Adapted for 8.0 + +Subject: [PATCH] Revert "Don't buid static libaraies when only DSO required" +This reverts commit f633c347574c0d814050b4bf2493e0cac6a5988c. + +Subject: [PATCH] Revert "Link executable files using non PIC object files. +This reverts commit eef85229d0fe9f69d325aa0231e592f35c468afb. + +Subject: [PATCH] Revert "Fixed CLI/CGI/FPM build, when they are built together with Apache SAPI" +This reverts commit db094b4b2e5ef0f0c30f412ce3a2516e31e17da7. + + +diff -up ./build/Makefile.global.revert ./build/Makefile.global +--- ./build/Makefile.global.revert 2020-04-27 10:52:07.135873230 +0200 ++++ ./build/Makefile.global 2020-04-27 10:52:40.185719185 +0200 +@@ -16,7 +16,7 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND + build-binaries: $(PHP_BINARIES) + + libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +- $(LIBTOOL) --mode=link --tag=disable-static $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 + + libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +diff -up ./build/php.m4.revert ./build/php.m4 +--- ./build/php.m4.revert 2020-04-22 11:09:46.000000000 +0200 ++++ ./build/php.m4 2020-04-27 10:52:07.136873225 +0200 +@@ -851,7 +851,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[ + \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir) + + $3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES) +- \$(LIBTOOL) --mode=link --tag=disable-static ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) ++ \$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) + + EOF + ]) +diff -up ./configure.ac.revert ./configure.ac +--- ./configure.ac.revert 2020-04-27 10:52:07.133873239 +0200 ++++ ./configure.ac 2020-04-27 10:52:07.136873225 +0200 +@@ -1044,9 +1044,7 @@ enable_static=yes + + case $php_sapi_module in + shared[)] +- if test "$PHP_CGI" = "no" && test "$PHP_CLI" = "no" && test "$PHP_FPM" = "no" && test "$PHP_LITESPEED" = "no" && test "$PHP_PHPDBG" = "no"; then +- enable_static=no +- fi ++ enable_static=no + case $with_pic in + yes) + standard_libtool_flag='-prefer-pic' +diff -up ./sapi/cgi/config9.m4.revert ./sapi/cgi/config9.m4 +--- ./sapi/cgi/config9.m4.revert 2020-04-22 11:09:46.000000000 +0200 ++++ ./sapi/cgi/config9.m4 2020-04-27 10:52:07.136873225 +0200 +@@ -55,7 +55,7 @@ if test "$PHP_CGI" != "no"; then + 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)" + ;; + *) +- 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)" ++ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + ;; + esac + +diff -up ./sapi/cli/config.m4.revert ./sapi/cli/config.m4 +--- ./sapi/cli/config.m4.revert 2020-04-22 11:09:46.000000000 +0200 ++++ ./sapi/cli/config.m4 2020-04-27 10:52:07.136873225 +0200 +@@ -42,7 +42,7 @@ if test "$PHP_CLI" != "no"; then + 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)" + ;; + *) +- 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)" ++ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" + ;; + esac + +diff -up ./sapi/fpm/config.m4.revert ./sapi/fpm/config.m4 +--- ./sapi/fpm/config.m4.revert 2020-04-22 11:09:46.000000000 +0200 ++++ ./sapi/fpm/config.m4 2020-04-27 10:52:07.136873225 +0200 +@@ -660,7 +660,7 @@ if test "$PHP_FPM" != "no"; then + BUILD_FPM="\$(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_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" + ;; + *) +- BUILD_FPM="\$(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_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" ++ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" + ;; + esac + +diff -up ./sapi/litespeed/config.m4.revert ./sapi/litespeed/config.m4 +--- ./sapi/litespeed/config.m4.revert 2020-04-22 11:09:46.000000000 +0200 ++++ ./sapi/litespeed/config.m4 2020-04-27 10:52:07.136873225 +0200 +@@ -18,7 +18,7 @@ if test "$PHP_LITESPEED" != "no"; then + BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" + ;; + *) +- BUILD_LITESPEED="\$(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_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" ++ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" + ;; + esac + +diff -up ./sapi/phpdbg/config.m4.revert ./sapi/phpdbg/config.m4 +--- ./sapi/phpdbg/config.m4.revert 2020-04-22 11:09:46.000000000 +0200 ++++ ./sapi/phpdbg/config.m4 2020-04-27 10:52:07.136873225 +0200 +@@ -63,9 +63,9 @@ if test "$BUILD_PHPDBG" = "" && test "$P + + BUILD_PHPDBG="\$(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_PHPDBG_OBJS:.lo=.o) \ ++ \$(PHP_GLOBAL_OBJS) \ ++ \$(PHP_BINARY_OBJS) \ ++ \$(PHP_PHPDBG_OBJS) \ + \$(EXTRA_LIBS) \ + \$(PHPDBG_EXTRA_LIBS) \ + \$(ZEND_EXTRA_LIBS) \ @@ -97,9 +97,9 @@ %global with_zip 0 -%global gh_commit 6ef0d470bfe3c6f45ff34241d8964a73f494acc5 +%global gh_commit 48a34bc1202e9664121c9e9aa004c79ac71af3f5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 20200422 +%global gh_date 20200427 %global gh_owner php %global gh_project php-src %global upver 8.0.0 @@ -109,7 +109,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -Release: 4%{?dist} +Release: 5%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -151,6 +151,8 @@ Patch5: php-7.2.0-includedir.patch Patch6: php-7.4.0-embed.patch Patch8: php-7.4.0-libdb.patch Patch9: php-7.0.7-curl.patch +# revert changes (already reverted upstream in 7.4) +Patch10: php-8.0.0-static.patch # Functional changes Patch42: php-7.3.3-systzdata-v18.patch @@ -930,6 +932,7 @@ in pure PHP. %if 0%{?rhel} %patch9 -p1 -b .curltls %endif +%patch10 -p1 -b .revert %if 0%{?fedora} >= 28 || 0%{?rhel} >= 6 %patch42 -p1 -b .systzdata @@ -1814,6 +1817,10 @@ fi %changelog +* Mon Apr 27 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200427-5 +- new snapshot +- revert changes to use non PIC object files + * Wed Apr 22 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200422-4 - new snapshot |