com php-src: Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions): sapi/cgi/config 9.m4 sapi/cli/config.m4
sapi/fpm/config.m4
| From: | Lior Kaplan | Date: | Mon, 23 Nov 2015 16:40:47 +0000 |
| Subject: | com php-src: Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions): sapi/cgi/config 9.m4 sapi/cli/config.m4 sapi/fpm/config.m4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89976@lists.php.net to get a copy of this message | ||
Commit: d6b78a351127285c907bc30cab79eed0b7941330
Author: Lior Kaplan <kaplanlior@gmail.com> Mon, 23 Nov 2015 18:40:47 +0200
Parents: b9845e5006adb7a41d6fdf5d36fc3b5c129f8946
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d6b78a351127285c907bc30cab79eed0b7941330
Log:
Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
Bugs:
https://bugs.php.net/61751
Changed paths:
M sapi/cgi/config9.m4
M sapi/cli/config.m4
M sapi/fpm/config.m4
Diff:
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index 49e61c8..16ee22f 100644
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -55,9 +55,9 @@ if test "$PHP_CGI" != "no"; then
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_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)"
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_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)"
fi
;;
*darwin*)
diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 9a1b98d..1a585c3 100644
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -36,9 +36,9 @@ if test "$PHP_CLI" != "no"; then
case $host_alias in
*aix*)
if test "$php_sapi_module" = "shared"; then
- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_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_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_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_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
else
- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_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_CLI_OBJS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym
&& nm -BCpg \echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_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_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
fi
;;
*darwin*)
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index f87776a...7bfa50b 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -713,7 +713,7 @@ if test "$PHP_FPM" != "no"; then
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_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)"
;;
*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)"