Author: glen Date: Wed May 10 09:41:43 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- link apache sapis with libphp_common from tempdir (merged from php patches)
---- Files affected:
SOURCES:
php4-both-apxs.patch (1.3 -> 1.4) , php4-shared.patch (1.20 -> 1.21) ,
php4-versioning.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/php4-both-apxs.patch
diff -u SOURCES/php4-both-apxs.patch:1.3 SOURCES/php4-both-apxs.patch:1.4
--- SOURCES/php4-both-apxs.patch:1.3 Sat Jul 9 23:47:27 2005
+++ SOURCES/php4-both-apxs.patch Wed May 10 11:41:37 2006
@@ -2,10 +2,10 @@
+++ ./Makefile.global 2005-06-16 23:10:40.000000000 +0300
@@ -20,6 +20,11 @@
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) $(PHP_RPATHS)
$(phptempdir)/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) $(PHP_RPATHS)
$(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS)
$(ZEND_EXTRA_LIBS) -o $@
+
+libtool-sapi: $(LIBTOOL_SAPI)
+
================================================================
Index: SOURCES/php4-shared.patch
diff -u SOURCES/php4-shared.patch:1.20 SOURCES/php4-shared.patch:1.21
--- SOURCES/php4-shared.patch:1.20 Sat Apr 15 17:12:18 2006
+++ SOURCES/php4-shared.patch Wed May 10 11:41:38 2006
@@ -13,7 +13,7 @@
+ $(LIBTOOL) --silent --mode=install cp libphp_common.la
$(phptempdir)/libphp_common.la
+
+libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
-+ $(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) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS)
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS)
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o)
$(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@
libs/libphp4.so
================================================================
Index: SOURCES/php4-versioning.patch
diff -u SOURCES/php4-versioning.patch:1.6 SOURCES/php4-versioning.patch:1.7
--- SOURCES/php4-versioning.patch:1.6 Thu Apr 20 21:51:40 2006
+++ SOURCES/php4-versioning.patch Wed May 10 11:41:38 2006
@@ -45,11 +45,11 @@
libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
- $(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) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS)
$(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(phptempdir)/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) -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) $(phptempdir)/libphp_common.la
$(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
libtool-sapi: $(LIBTOOL_SAPI)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/php4-both-apxs.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/php4-shared.patch?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/SOURCES/php4-versioning.patch?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
