- up to 5.3.3, fpm patch included but broken

[packages/php.git] / php-fpm-shared.patch

diff --git a/php-fpm-shared.patch b/php-fpm-shared.patch
index 154ac09cfb149cc82ca68345e0a0b26aa7298394..bc52fe7d87fd4ef88e2a6062a96bef8b509271a6 100644 (file)
--- a/php-fpm-shared.patch
+++ b/php-fpm-shared.patch
@@ -1,11 +1,22 @@
---- php-5.3.1/sapi/fpm/ac/fpm_build.m4~        2009-11-26 18:12:06.000000000 +0200
-+++ php-5.3.1/sapi/fpm/ac/fpm_build.m4 2009-11-26 21:57:28.003071130 +0200
-@@ -36,7 +36,7 @@
+--- php-5.3.3/sapi/fpm/config.m4~      2010-06-16 11:58:42.000000000 +0300
++++ php-5.3.3/sapi/fpm/config.m4       2010-07-24 22:32:25.642457281 +0300
+@@ -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_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
        ;;
-     esac
+   esac
  
+--- php-5.3.3/sapi/fpm/Makefile.frag~  2010-05-30 01:00:43.000000000 +0300
++++ php-5.3.3/sapi/fpm/Makefile.frag   2010-07-24 22:33:51.945781258 +0300
+@@ -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_common.la $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+       $(BUILD_FPM)
+ 
+ $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h