Sophie

Sophie

distrib > Mandriva > cs4.0 > i586 > by-pkgid > 665b53d51b37ef4d3a9c620ff5a368c6 > files > 22

php4-4.4.4-1mlcs4.src.rpm

diff -Naur php-4.3.6/Makefile.global php-4.3.6.oden/Makefile.global
--- php-4.3.6/Makefile.global	2003-12-04 16:59:04.000000000 +0100
+++ php-4.3.6.oden/Makefile.global	2004-05-04 18:51:59.970767463 +0200
@@ -6,12 +6,15 @@
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
 
 
-all: $(all_targets) 
+all: libphp4_common.so $(all_targets) 
 	@echo
 	@echo "Build complete."
 	@echo "(It is safe to ignore warnings about tempnam and tmpnam)."
 	@echo
 	
+libphp4_common.so: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+	ld -shared -soname libphp4_common.so.4 -lc $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ 
+
 build-modules: $(PHP_MODULES)
 
 libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
diff -Naur php-4.3.6/sapi/cgi/config9.m4 php-4.3.6.oden/sapi/cgi/config9.m4
--- php-4.3.6/sapi/cgi/config9.m4	2003-12-01 17:12:38.000000000 +0100
+++ php-4.3.6.oden/sapi/cgi/config9.m4	2004-05-04 18:45:52.811479566 +0200
@@ -157,7 +157,7 @@
         BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
       ;;
       *)
-        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) -L. -lphp4_common \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
       ;;
     esac
 
diff -Naur php-4.3.6/sapi/cli/config.m4 php-4.3.6.oden/sapi/cli/config.m4
--- php-4.3.6/sapi/cli/config.m4	2003-12-01 17:12:40.000000000 +0100
+++ php-4.3.6.oden/sapi/cli/config.m4	2004-05-04 18:45:52.811479566 +0200
@@ -27,7 +27,7 @@
     BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     ;;
   *)
-    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) -L. -lphp4_common \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     ;;
   esac
   INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)"