SOURCES (DEVEL): php4-both-apxs.patch - be generic to build any sapi

glen glen at pld-linux.org
Wed Jul 6 23:40:23 CEST 2005


Author: glen                         Date: Wed Jul  6 21:40:23 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- be generic to build any sapi

---- Files affected:
SOURCES:
   php4-both-apxs.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/php4-both-apxs.patch
diff -u SOURCES/php4-both-apxs.patch:1.1.2.1 SOURCES/php4-both-apxs.patch:1.1.2.2
--- SOURCES/php4-both-apxs.patch:1.1.2.1	Fri Jun 17 15:19:20 2005
+++ SOURCES/php4-both-apxs.patch	Wed Jul  6 23:40:18 2005
@@ -1,14 +1,13 @@
 --- ./Makefile.global~	2005-06-16 21:21:20.000000000 +0300
 +++ ./Makefile.global	2005-06-16 23:10:40.000000000 +0300
-@@ -20,6 +20,12 @@
+@@ -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 $@
  
-+sapi/apache/libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
++$(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 $@
 +
-+sapi/apache2handler/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 $@
++sapi: $(LIBTOOL_SAPI)
 +
  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-both-apxs.patch?r1=1.1.2.1&r2=1.1.2.2&f=u




More information about the pld-cvs-commit mailing list