com php-src: Merge branch 'PHP-5.6' into PHP-7.0: sapi/cgi/config9.m4 sapi/cli/config.m4 sapi/fpm/config.m4
| From: | Lior Kaplan | Date: | Mon, 23 Nov 2015 16:56:13 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: sapi/cgi/config9.m4 sapi/cli/config.m4 sapi/fpm/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89981@lists.php.net to get a copy of this message | ||
Commit: 9642710a0985f5cf1bf4e3762236439694f072d9
Author: Lior Kaplan <kaplanlior@gmail.com> Mon, 23 Nov 2015 18:56:13 +0200
Parents: c1189eccae3c555ac5a8610110bb3edb80998d2c 1c72e5b29929360167cdeec93b21bb9b6ef33c57
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9642710a0985f5cf1bf4e3762236439694f072d9
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
Conflicts:
sapi/cgi/config9.m4
sapi/fpm/config.m4
Bugs:
https://bugs.php.net/61751
Changed paths:
MM sapi/cgi/config9.m4
MM sapi/cli/config.m4
MM sapi/fpm/config.m4
Diff:
diff --cc sapi/cgi/config9.m4
index e2195f4,16ee22f..f544426
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@@ -55,9 -55,9 +55,9 @@@ if test "$PHP_CGI" != "no"; the
case $host_alias in
*aix*)
if test "$php_sapi_module" = "shared"; then
- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \
echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\ | \$(AWK) '{ if (((\$\$2 ==
\"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) &&
(substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym
&& \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\ | \$(AWK) '{ if (((\$\$2 ==
\"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) &&
(substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym
&& \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
++ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\ | \$(AWK) '{ if (((\$\$2 ==
\"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) &&
(substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym
&& \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o
\$(SAPI_CGI_PATH)"
else
- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\ | \$(AWK) '{ if (((\$\$2 == \"T\")
|| (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) !=
\".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL)
--mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\ | \$(AWK) '{ if (((\$\$2 == \"T\")
|| (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) !=
\".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL)
--mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS)
\$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
++ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\ | \$(AWK) '{ if (((\$\$2 == \"T\")
|| (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) !=
\".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL)
--mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS)
\$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
fi
;;
*darwin*)
diff --cc sapi/fpm/config.m4
index 1c496e5,7bfa50b..e6a1a49
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@@ -712,13 -713,13 +712,13 @@@ if test "$PHP_FPM" != "no"; the
case $host_alias in
*aix*)
- BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\ | \$(AWK) '{ if (((\$\$2 == \"T\")
|| (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) !=
\".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL)
--mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FASTCGI_OBJS)
\$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
- BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\ | \$(AWK) '{ if (((\$\$2 == \"T\")
|| (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) !=
\".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL)
--mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS)
\$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
++ BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\ | \$(AWK) '{ if (((\$\$2 == \"T\")
|| (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) !=
\".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL)
--mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(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)"
;;
*darwin*)
- BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o)
\$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o
\$(SAPI_FPM_PATH)"
+ 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_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) \$(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