Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > 703be88416437e3c28825398ad6321d4 > files > 12

php-5.3.6-2.1.mga1.src.rpm

diff -Naur php-5.3.2/sapi/fpm/Makefile.frag php-5.3.2.oden/sapi/fpm/Makefile.frag
--- php-5.3.2/sapi/fpm/Makefile.frag	2010-05-31 12:48:35.000000000 -0400
+++ php-5.3.2.oden/sapi/fpm/Makefile.frag	2010-06-09 06:49:51.000000000 -0400
@@ -3,7 +3,7 @@
 $(builddir)/fpm: 
 	@mkdir -p $(builddir)/fpm
 
-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+$(SAPI_FPM_PATH): $(builddir)/fpm libphp$(PHP_MAJOR_VERSION)_common.la $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
 	$(BUILD_FPM)
 
 $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
diff -Naur php-5.3.2/sapi/fpm/config.m4 php-5.3.2.oden/sapi/fpm/config.m4
--- php-5.3.2/sapi/fpm/config.m4	2010-05-31 12:48:35.000000000 -0400
+++ php-5.3.2.oden/sapi/fpm/config.m4	2010-06-09 06:48:20.000000000 -0400
@@ -600,7 +600,7 @@
         BUILD_FPM="\$(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) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
       ;;
       *)
-        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp\$(PHP_MAJOR_VERSION)_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
       ;;
   esac