From 2e43d27999bf2c74044786883fea888778dd0485 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Oct 2019 09:58:31 +0200 Subject: test build with more upstream patches --- 33958ccb3600daa3a3b96671aadada5e75bfd075.patch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 33958ccb3600daa3a3b96671aadada5e75bfd075.patch (limited to '33958ccb3600daa3a3b96671aadada5e75bfd075.patch') diff --git a/33958ccb3600daa3a3b96671aadada5e75bfd075.patch b/33958ccb3600daa3a3b96671aadada5e75bfd075.patch new file mode 100644 index 0000000..7be359e --- /dev/null +++ b/33958ccb3600daa3a3b96671aadada5e75bfd075.patch @@ -0,0 +1,26 @@ +From 33958ccb3600daa3a3b96671aadada5e75bfd075 Mon Sep 17 00:00:00 2001 +From: Dmitry Stogov +Date: Thu, 10 Oct 2019 16:24:15 +0300 +Subject: [PATCH] Revert "Fixed CLI/CGI/FPM build, when they are built together + with Apache SAPI" + +This reverts commit db094b4b2e5ef0f0c30f412ce3a2516e31e17da7. +--- + configure.ac | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a522bdc2b562..8f19fe0e60d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1103,9 +1103,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' -- cgit