com php-src: FIx darwin build: sapi/fpm/config.m4
| From: | Stanislav Malyshev | Date: | Sun, 31 May 2015 21:52:08 +0000 |
| Subject: | com php-src: FIx darwin build: sapi/fpm/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87026@lists.php.net to get a copy of this message | ||
Commit: 07241bbd70cce10518781705fdd9cc18b4692f0b
Author: Stanislav Malyshev <stas@php.net> Sun, 31 May 2015 14:52:08 -0700
Parents: 8e54f91cc91b1ca9ab531dd58f609415e9d18f29
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=07241bbd70cce10518781705fdd9cc18b4692f0b
Log:
FIx darwin build
Changed paths:
M sapi/fpm/config.m4
Diff:
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 7fa7c27..1c496e5 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -715,7 +715,7 @@ if test "$PHP_FPM" != "no"; then
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)"
;;
*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_FASTCGI_OBJS) \$(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_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS)
\$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"