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