SOURCES: php4-shared.patch - adjust with php4-linkflags-clean.patch

[glen]

Author: glen                         Date: Wed Apr  5 11:10:48 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjust with php4-linkflags-clean.patch

---- Files affected:
SOURCES:
   php4-shared.patch (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SOURCES/php4-shared.patch
diff -u SOURCES/php4-shared.patch:1.16 SOURCES/php4-shared.patch:1.17
--- SOURCES/php4-shared.patch:1.16	Wed Aug 11 18:57:30 2004
+++ SOURCES/php4-shared.patch	Wed Apr  5 13:10:42 2006
@@ -1,18 +1,17 @@
-diff -burN php-4.3.3RC2.orig/Makefile.global php-4.3.3RC2-shared/Makefile.global
---- php-4.3.3RC2.orig/Makefile.global	Thu Jul 24 19:45:15 2003
-+++ php-4.3.3RC2-shared/Makefile.global	Sat Aug  2 22:53:18 2003
+--- php-4.4.2/Makefile.global~	2006-04-05 14:05:49.664133122 +0300
++++ php-4.4.2/Makefile.global	2006-04-05 14:06:38.945228217 +0300
 @@ -14,9 +14,11 @@
  	
  build-modules: $(PHP_MODULES)
  
 -libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
--	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+-	$(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 -	-@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
 +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) -rpath $(phptempdir) -avoid-version $(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) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php4-shared.patch?r1=1.16&r2=1.17&f=u