SOURCES: php4-versioning.patch - save work. NFY
glen
glen at pld-linux.org
Wed Apr 5 18:55:01 CEST 2006
Author: glen Date: Wed Apr 5 16:55:01 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- save work. NFY
---- Files affected:
SOURCES:
php4-versioning.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/php4-versioning.patch
diff -u SOURCES/php4-versioning.patch:1.2 SOURCES/php4-versioning.patch:1.3
--- SOURCES/php4-versioning.patch:1.2 Tue Apr 4 01:20:06 2006
+++ SOURCES/php4-versioning.patch Wed Apr 5 18:54:55 2006
@@ -4,7 +4,7 @@
mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
INSTALL = $(top_srcdir)/build/shtool install -c
INSTALL_DATA = $(INSTALL) -m 644
-+LD_VERSION_SCRIPT="-Wl,--version-script=$(abs_srcdir)/php.ver"
++LD_VERSION_SCRIPT=-Wl,--version-script=$(top_srcdir)/php.ver
DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
@@ -12,36 +12,69 @@
+++ php-4.4.2/php.ver 2006-04-04 00:40:55.609652026 +0300
@@ -0,0 +1 @@
+php4 { global: *; };
---- php-4.4.2/acinclude.m4~ 2006-04-03 21:43:42.852081966 +0300
-+++ php-4.4.2/acinclude.m4 2006-04-04 00:47:58.259016152 +0300
+--- php-4.4.2/acinclude.m4~ 2006-04-05 14:07:34.806469587 +0300
++++ php-4.4.2/acinclude.m4 2006-04-05 14:07:59.667022065 +0300
@@ -1205,7 +1205,7 @@
;;
*[)]
suffix=la
-- link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
-+ link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(LD_VERSION_SCRIPT) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+- link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
++ link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) libphp_common.la $(EXTRA_LDFLAGS) $(LD_VERSION_SCRIPT) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
;;
esac
---- php-4.4.2/Makefile.global~ 2006-04-04 00:49:19.340813340 +0300
-+++ php-4.4.2/Makefile.global 2006-04-04 00:59:15.364031114 +0300
+# this would add dependency, but meanwhile require libphp_common.la linking at external extension build time. sigh
+#@@ -1215,7 +1215,7 @@
+# \$(phplibdir)/$1.$suffix: $3/$1.$suffix
+# \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir)
+#
+#-$3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
+#+$3/$1.$suffix: libphp_common.la \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
+# $link_cmd
+#
+# EOF
+--- php-4.4.2/Makefile.global~ 2006-04-05 02:56:01.208583507 +0300
++++ php-4.4.2/Makefile.global 2006-04-05 02:57:01.759935067 +0300
@@ -16,13 +16,13 @@
build-modules: $(PHP_MODULES)
libphp_common.la: $(PHP_GLOBAL_OBJS)
-- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LD_VERSION_SCRIPT) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
+- $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
++ $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LD_VERSION_SCRIPT) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
-- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+- $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
++ $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS)
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
++ $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
libtool-sapi: $(LIBTOOL_SAPI)
+--- php-4.4.2/scripts/Makefile.frag~ 2006-04-05 19:13:33.607375995 +0300
++++ php-4.4.2/scripts/Makefile.frag 2006-04-05 19:20:46.147058812 +0300
+@@ -13,7 +13,8 @@
+ build/libtool.m4 \
+ Makefile.global \
+ acinclude.m4 \
+- ltmain.sh
++ ltmain.sh \
++ php.ver
+
+ BUILD_FILES_EXEC = \
+ build/shtool \
+--- php-4.4.2/scripts/phpize.in~ 2006-04-05 19:39:16.851897371 +0300
++++ php-4.4.2/scripts/phpize.in 2006-04-05 19:39:17.921921323 +0300
+@@ -8,7 +8,7 @@
+ builddir="`pwd`"
+
+ FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
+-FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh"
++FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh php.ver"
+ CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
+ mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
+ aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
--- php-4.4.2/sapi/apache/mod_php4.c~ 2006-01-01 15:47:01.000000000 +0200
+++ php-4.4.2/sapi/apache/mod_php4.c 2006-04-04 02:02:52.348791307 +0300
@@ -910,7 +910,9 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/php4-versioning.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list