dmitry Thu Jul 7 01:54:43 2005 EDT
Modified files:
/php-src NEWS acinclude.m4
/php-src/sapi/cgi config9.m4
/php-src/sapi/cli config.m4
Log:
Fixed support for shared extensions on AIX
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1982&r2=1.1983&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1982 php-src/NEWS:1.1983
--- php-src/NEWS:1.1982 Tue Jul 5 17:33:31 2005
+++ php-src/NEWS Thu Jul 7 01:54:36 2005
@@ -1,6 +1,10 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, PHP 5.1 Beta 3
+- Fixed support for shared extensions on AIX. Now CLI/CGI PHP binaries are
+ compiled with runtime linker. Shared extensions are compiled as .so (ready
+ for runtime linking). To support shared extensions Apache/Apache2 must be
+ linked with -brtl too. (Dmitry)
- Upgraded bundled SQLite library for PDO:SQLite to 3.2.2 (Ilia)
- Added PDO_MYSQL_ATTR_USE_BUFFERED_QUERY parameter for pdo_mysql. (Ilia)
- Added date_timezone_set() function to set the timezone that the date
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.325&r2=1.326&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.325 php-src/acinclude.m4:1.326
--- php-src/acinclude.m4:1.325 Tue Jun 28 16:58:34 2005
+++ php-src/acinclude.m4 Thu Jul 7 01:54:42 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.325 2005/06/28 20:58:34 sniper Exp $
+dnl $Id: acinclude.m4,v 1.326 2005/07/07 05:54:42 dmitry Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -850,6 +850,10 @@
install_modules="install-modules"
case $host_alias in
+ *aix*[)]
+ suffix=so
+ link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)])
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$3'/$1.la
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir)
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) && mv -f
'$3'/.libs/$1.so '$3'/$1.so'
+ ;;
*darwin*[)]
suffix=so
link_cmd='ifelse($4,,[$(CC)],[$(CXX)]) -dynamic -flat_namespace -bundle
-undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS)
-o [$]@ $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
http://cvs.php.net/diff.php/php-src/sapi/cgi/config9.m4?r1=1.16&r2=1.17&ty=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.16 php-src/sapi/cgi/config9.m4:1.17
--- php-src/sapi/cgi/config9.m4:1.16 Sun May 29 19:16:46 2005
+++ php-src/sapi/cgi/config9.m4 Thu Jul 7 01:54:43 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.16 2005/05/29 23:16:46 sniper Exp $
+dnl $Id: config9.m4,v 1.17 2005/07/07 05:54:43 dmitry Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -152,6 +152,9 @@
PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,
$PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
case $host_alias in
+ *aix*)
+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo
\$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_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_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ ;;
*darwin*)
BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
http://cvs.php.net/diff.php/php-src/sapi/cli/config.m4?r1=1.21&r2=1.22&ty=u
Index: php-src/sapi/cli/config.m4
diff -u php-src/sapi/cli/config.m4:1.21 php-src/sapi/cli/config.m4:1.22
--- php-src/sapi/cli/config.m4:1.21 Mon Jun 20 07:06:54 2005
+++ php-src/sapi/cli/config.m4 Thu Jul 7 01:54:43 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.21 2005/06/20 11:06:54 sniper Exp $
+dnl $Id: config.m4,v 1.22 2005/07/07 05:54:43 dmitry Exp $
dnl
AC_MSG_CHECKING(for CLI build)
@@ -19,6 +19,9 @@
PHP_SUBST(SAPI_CLI_PATH)
case $host_alias in
+ *aix*)
+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo
\$(PHP_GLOBAL_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)"
+ ;;
*darwin*)
BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
