projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| d51e0cbd ER |
1 | --- php-5.2.4/Makefile.global~ 2007-08-31 19:13:58.000000000 +0300 |
| 2 | +++ php-5.2.4/Makefile.global 2007-08-31 19:19:33.799017413 +0300 | |
| 3 | @@ -13,8 +13,12 @@ | |
| 220dfde4 | 4 | |
| 554abb27 | 5 | build-modules: $(PHP_MODULES) |
| 7a5af891 | 6 | |
| d51e0cbd | 7 | -libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) |
| 3bba13fb | 8 | - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ |
| 554abb27 | 9 | +libphp_common.la: $(PHP_GLOBAL_OBJS) |
| 3bba13fb | 10 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) |
| d51e0cbd | 11 | + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 |
| 554abb27 | 12 | + |
| d51e0cbd | 13 | +libphp$(PHP_MAJOR_VERSION).la: libphp_common.la $(PHP_SAPI_OBJS) |
| 3bba13fb | 14 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ |
| d51e0cbd | 15 | -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 |
| 7a5af891 | 16 | |
| d51e0cbd ER |
17 | libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) |
| 18 | @@ -25,10 +29,10 @@ | |
| 220dfde4 AG |
19 | install-sapi: $(OVERALL_TARGET) |
| 20 | @echo "Installing PHP SAPI module: $(PHP_SAPI)" | |
| f161d428 | 21 | -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| d51e0cbd | 22 | - -@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \ |
| 9119897e | 23 | + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); then \ |
| 220dfde4 | 24 | for i in 0.0.0 0.0 0; do \ |
| d51e0cbd ER |
25 | - if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \ |
| 26 | - $(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \ | |
| 9119897e ER |
27 | + if test -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ |
| 28 | + $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \ | |
| 220dfde4 AG |
29 | break; \ |
| 30 | fi; \ | |
| 31 | done; \ | |
| 77d71989 AM |
32 | --- php-5.0.0.org/sapi/cgi/config9.m4 2004-07-25 22:41:53.698171496 +0200 |
| 33 | +++ php-5.0.0/sapi/cgi/config9.m4 2004-07-25 22:42:04.894469400 +0200 | |
| 220dfde4 | 34 | @@ -156,7 +156,7 @@ |
| 3bba13fb | 35 | BUILD_CGI="\$(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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" |
| eac78ba2 JB |
36 | ;; |
| 37 | *) | |
| 3bba13fb ER |
38 | - BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" |
| 39 | + BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" | |
| eac78ba2 JB |
40 | ;; |
| 41 | esac | |
| 42 | ||
| 77d71989 AM |
43 | --- php-5.0.0.org/sapi/cgi/Makefile.frag 2004-07-25 22:41:53.696171800 +0200 |
| 44 | +++ php-5.0.0/sapi/cgi/Makefile.frag 2004-07-25 22:42:04.895469248 +0200 | |
| 917119c9 AM |
45 | @@ -1,2 +1,2 @@ |
| 46 | -$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) | |
| 47 | +$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS) | |
| 48 | $(BUILD_CGI) | |
| 77d71989 AM |
49 | --- php-5.0.0.org/sapi/cli/config.m4 2004-07-25 22:41:53.700171192 +0200 |
| 50 | +++ php-5.0.0/sapi/cli/config.m4 2004-07-25 22:42:04.895469248 +0200 | |
| 220dfde4 | 51 | @@ -27,7 +27,7 @@ |
| 3bba13fb | 52 | BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" |
| eac78ba2 JB |
53 | ;; |
| 54 | *) | |
| 3bba13fb ER |
55 | - BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" |
| 56 | + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" | |
| eac78ba2 JB |
57 | ;; |
| 58 | esac | |
| 917119c9 | 59 | INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" |
| 77d71989 AM |
60 | --- php-5.0.0.org/sapi/cli/Makefile.frag 2004-07-25 22:41:53.699171344 +0200 |
| 61 | +++ php-5.0.0/sapi/cli/Makefile.frag 2004-07-25 22:42:04.896469096 +0200 | |
| 917119c9 AM |
62 | @@ -1,6 +1,6 @@ |
| 63 | cli: $(SAPI_CLI_PATH) | |
| 64 | ||
| 65 | -$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) | |
| 66 | +$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS) | |
| 67 | $(BUILD_CLI) | |
| 68 | ||
| 69 | install-cli: $(SAPI_CLI_PATH) |