]>
Commit | Line | Data |
---|---|---|
86a42589 ER |
1 | --- php-5.3.3/sapi/fpm/config.m4~ 2010-06-16 11:58:42.000000000 +0300 |
2 | +++ php-5.3.3/sapi/fpm/config.m4 2010-07-24 22:32:25.642457281 +0300 | |
3 | @@ -600,7 +600,7 @@ | |
cc446d0d ER |
4 | 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)" |
5 | ;; | |
6 | *) | |
7 | - 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)" | |
8 | + 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)" | |
9 | ;; | |
86a42589 | 10 | esac |
cc446d0d | 11 | |
86a42589 ER |
12 | --- php-5.3.3/sapi/fpm/Makefile.frag~ 2010-05-30 01:00:43.000000000 +0300 |
13 | +++ php-5.3.3/sapi/fpm/Makefile.frag 2010-07-24 22:33:51.945781258 +0300 | |
14 | @@ -3,7 +3,7 @@ | |
15 | $(builddir)/fpm: | |
16 | @mkdir -p $(builddir)/fpm | |
17 | ||
18 | -$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS) | |
19 | +$(SAPI_FPM_PATH): $(builddir)/fpm libphp_common.la $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS) | |
20 | $(BUILD_FPM) | |
21 | ||
22 | $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h |