diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-12-20 11:34:20 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-12-20 11:34:20 +0000 |
| commit | 1f94356efc73f39a335ed9e650f02cc060cc7a84 (patch) | |
| tree | 49c51f0d0bb33416bdf96bd8c3ea4d9b056438a0 /lang/php5/files | |
| parent | Fix -d on openbox. (diff) | |
Update to 5.3.4 release.
PR: ports/153250
Submitted by: mm
Notes
Notes:
svn path=/head/; revision=266647
Diffstat (limited to 'lang/php5/files')
| -rw-r--r-- | lang/php5/files/patch-sapi_fpm_config.m4 | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/lang/php5/files/patch-sapi_fpm_config.m4 b/lang/php5/files/patch-sapi_fpm_config.m4 index 91c8744adede..66e5c74fe0c1 100644 --- a/lang/php5/files/patch-sapi_fpm_config.m4 +++ b/lang/php5/files/patch-sapi_fpm_config.m4 @@ -1,23 +1,17 @@ ---- sapi/fpm/config.m4.orig 2010-06-16 10:58:42.000000000 +0200 -+++ sapi/fpm/config.m4 2010-07-27 13:26:02.000000000 +0200 -@@ -562,10 +562,12 @@ +--- sapi/fpm/config.m4.orig 2010-11-26 14:46:15.000000000 +0100 ++++ sapi/fpm/config.m4 2010-12-17 15:22:19.000000000 +0100 +@@ -394,7 +394,9 @@ - PHP_FPM_CFLAGS="$LIBEVENT_CFLAGS -I$abs_srcdir/sapi/fpm" - -- SAPI_EXTRA_LIBS="$LIBEVENT_LIBS" -- PHP_SUBST(SAPI_EXTRA_LIBS) -- + PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm" + - INSTALL_IT=":" -+ FPM_EXTRA_LIBS="$LIBEVENT_LIBS" -+ PHP_SUBST(FPM_EXTRA_LIBS) -+ + if test "$PHP_SAPI" = "default"; then + PHP_SAPI="fpm" + fi PHP_FPM_FILES="fpm/fastcgi.c \ fpm/fpm.c \ fpm/fpm_children.c \ -@@ -590,7 +592,8 @@ +@@ -419,7 +421,8 @@ fpm/zlog.c \ " @@ -27,12 +21,12 @@ case $host_alias in *aix*) -@@ -600,11 +603,19 @@ +@@ -429,11 +432,19 @@ 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) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_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_FPM_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" ;; esac |