SOURCES: php-versioning.patch (NEW), php4-versioning.patch (NEW) -...
glen
glen at pld-linux.org
Tue Apr 4 00:52:16 CEST 2006
Author: glen Date: Mon Apr 3 22:52:16 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- attempt to version all php shared objects to be able to load both versions to sameapache
---- Files affected:
SOURCES:
php-versioning.patch (NONE -> 1.1) (NEW), php4-versioning.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/php-versioning.patch
diff -u /dev/null SOURCES/php-versioning.patch:1.1
--- /dev/null Tue Apr 4 00:52:16 2006
+++ SOURCES/php-versioning.patch Tue Apr 4 00:52:11 2006
@@ -0,0 +1,46 @@
+--- php-4.4.2/Makefile.global~ 2006-04-04 00:35:27.582384109 +0300
++++ php-4.4.2/Makefile.global 2006-04-04 00:40:19.318848123 +0300
+@@ -1,6 +1,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"
+
+ DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
+ COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
+--- /dev/null 2006-03-28 14:00:37.387408000 +0300
++++ php-4.4.2/php.ver 2006-04-04 00:40:55.609652026 +0300
+@@ -0,0 +1 @@
++php5 { 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
+@@ -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)'
+ ;;
+ esac
+
+--- php-5.1.2/Makefile.global~ 2006-04-04 01:20:14.511991339 +0300
++++ php-5.1.2/Makefile.global 2006-04-04 01:20:51.782819766 +0300
+@@ -15,15 +15,15 @@
+ 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 $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
+ -@$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1
+
+ libphp5.la: libphp_common.la $(PHP_SAPI_OBJS)
+- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/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) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+ -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
+
+ $(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS)
+- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/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) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+ -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
+
+ libtool-sapi: $(LIBTOOL_SAPI)
================================================================
Index: SOURCES/php4-versioning.patch
diff -u /dev/null SOURCES/php4-versioning.patch:1.1
--- /dev/null Tue Apr 4 00:52:16 2006
+++ SOURCES/php4-versioning.patch Tue Apr 4 00:52:11 2006
@@ -0,0 +1,44 @@
+--- php-4.4.2/Makefile.global~ 2006-04-04 00:35:27.582384109 +0300
++++ php-4.4.2/Makefile.global 2006-04-04 00:40:19.318848123 +0300
+@@ -1,6 +1,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"
+
+ DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
+ COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
+--- /dev/null 2006-03-28 14:00:37.387408000 +0300
++++ 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
+@@ -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)'
+ ;;
+ 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
+@@ -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)
+
+ 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_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-sapi: $(LIBTOOL_SAPI)
+
================================================================
More information about the pld-cvs-commit
mailing list