commit 8ce4914e52132012698208b5d66ec3d830f56507
Author: Elan Ruusamäe <[email protected]>
Date: Sun Aug 11 13:45:28 2019 +0300
merge php-fpm-shared.patch into php-shared.patch
php-fpm-shared.patch | 21 ---------------------
php-shared.patch | 21 +++++++++++++++++++++
php.spec | 2 --
3 files changed, 21 insertions(+), 23 deletions(-)
---
diff --git a/php.spec b/php.spec
index 1b870a6..f6b23dd 100644
--- a/php.spec
+++ b/php.spec
@@ -202,7 +202,6 @@ Patch29: %{orgname}-fcgi-graceful.patch
Patch31: %{orgname}-fcgi-error_log-no-newlines.patch
Patch39: %{orgname}-use-prog_sendmail.patch
Patch41: %{orgname}-fpm-config.patch
-Patch42: %{orgname}-fpm-shared.patch
Patch43: %{orgname}-silent-session-cleanup.patch
Patch44: %{orgname}-include_path.patch
Patch50: extension-shared-optional-dep.patch
@@ -1894,7 +1893,6 @@ cp -p php.ini-production php.ini
%patch31 -p1
%patch39 -p1
%patch41 -p1
-%patch42 -p1
%patch43 -p1
%patch44 -p1
%patch50 -p1
diff --git a/php-fpm-shared.patch b/php-fpm-shared.patch
deleted file mode 100644
index 7899094..0000000
--- a/php-fpm-shared.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- php-7.0.0beta1/sapi/fpm/config.m4~ 2015-07-10 15:11:43.000000000 +0300
-+++ php-7.0.0beta1/sapi/fpm/config.m4 2015-07-15 13:55:23.427687256 +0300
-@@ -718,7 +718,7 @@
- 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) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_FPM_OBJS) \$(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) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o
\$(SAPI_FPM_PATH)"
- ;;
- esac
-
---- php-7.0.0beta1/sapi/fpm/Makefile.frag~ 2015-07-15 13:54:11.000000000
+0300
-+++ php-7.0.0beta1/sapi/fpm/Makefile.frag 2015-07-15 13:56:12.116885111
+0300
-@@ -1,6 +1,6 @@
- fpm: $(SAPI_FPM_PATH)
-
--$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS)
$(PHP_FPM_OBJS)
-+$(SAPI_FPM_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS)
$(PHP_FPM_OBJS) $(SAPI_EXTRA_DEPS)
- $(BUILD_FPM)
-
- install-fpm: $(SAPI_FPM_PATH)
diff --git a/php-shared.patch b/php-shared.patch
index 0768faa..6c25bc0 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -143,3 +143,24 @@
;;
esac
+--- php-7.0.0beta1/sapi/fpm/config.m4~ 2015-07-10 15:11:43.000000000 +0300
++++ php-7.0.0beta1/sapi/fpm/config.m4 2015-07-15 13:55:23.427687256 +0300
+@@ -718,7 +718,7 @@
+ 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) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_FPM_OBJS) \$(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) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o
\$(SAPI_FPM_PATH)"
+ ;;
+ esac
+
+--- php-7.0.0beta1/sapi/fpm/Makefile.frag~ 2015-07-15 13:54:11.000000000
+0300
++++ php-7.0.0beta1/sapi/fpm/Makefile.frag 2015-07-15 13:56:12.116885111
+0300
+@@ -1,6 +1,6 @@
+ fpm: $(SAPI_FPM_PATH)
+
+-$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS)
$(PHP_FPM_OBJS)
++$(SAPI_FPM_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS)
$(PHP_FPM_OBJS) $(SAPI_EXTRA_DEPS)
+ $(BUILD_FPM)
+
+ install-fpm: $(SAPI_FPM_PATH)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/8ce4914e52132012698208b5d66ec3d830f56507
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
