]>
Commit | Line | Data |
---|---|---|
02d2dcbb ER |
1 | --- php-5.4.0alpha2/sapi/fpm/config.m4~ 2011-06-26 18:48:11.000000000 +0300 |
2 | +++ php-5.4.0alpha2/sapi/fpm/config.m4 2011-08-07 11:46:26.970876686 +0300 | |
3 | @@ -458,7 +458,7 @@ | |
4 | BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" | |
c0240cb1 | 5 | ;; |
6 | *) | |
02d2dcbb ER |
7 | - BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_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_BINARY_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" | |
c0240cb1 | 9 | ;; |
10 | esac | |
11 | ||
02d2dcbb ER |
12 | --- php-5.4.0alpha2/sapi/fpm/Makefile.frag~ 2011-07-02 19:10:18.000000000 +0300 |
13 | +++ php-5.4.0alpha2/sapi/fpm/Makefile.frag 2011-08-07 11:47:41.737422848 +0300 | |
14 | @@ -1,6 +1,6 @@ | |
15 | fpm: $(SAPI_FPM_PATH) | |
c0240cb1 | 16 | |
02d2dcbb ER |
17 | -$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FPM_OBJS) |
18 | +$(SAPI_FPM_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FPM_OBJS) $(SAPI_EXTRA_DEPS) | |
c0240cb1 | 19 | $(BUILD_FPM) |
20 | ||
02d2dcbb | 21 | install-fpm: $(SAPI_FPM_PATH) |