diff options
| author | Elan Ruusamäe | 2019-08-11 10:45:28 (GMT) |
|---|---|---|
| committer | Elan Ruusamäe | 2019-08-11 13:22:59 (GMT) |
| commit | 8ce4914e52132012698208b5d66ec3d830f56507 (patch) | |
| tree | dfa8578dbe3852ad2cafb3730c032cb89117bf22 /php-shared.patch | |
| parent | 8454be47f01810f5eb14a2d15529fb5a5df49937 (diff) | |
| download | php-8ce4914e52132012698208b5d66ec3d830f56507.zip php-8ce4914e52132012698208b5d66ec3d830f56507.tar.gz | |
merge php-fpm-shared.patch into php-shared.patch
Diffstat (limited to 'php-shared.patch')
| -rw-r--r-- | php-shared.patch | 21 |
1 files changed, 21 insertions, 0 deletions
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) |