]>
Commit | Line | Data |
---|---|---|
2a9b5aee ER |
1 | diff -u php-4.4.2/Makefile.global php-4.4.2/Makefile.global |
2 | --- php-4.4.2/Makefile.global 2006-04-05 14:06:38.945228217 +0300 | |
3 | +++ php-4.4.2/Makefile.global 2006-04-15 17:52:03.936932629 +0300 | |
b3f9db84 | 4 | @@ -14,9 +14,12 @@ |
92ea19de | 5 | |
7011c01c | 6 | build-modules: $(PHP_MODULES) |
0be0595c | 7 | |
71398d48 | 8 | -libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) |
56d9d471 | 9 | - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ |
71398d48 | 10 | - -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 |
7011c01c | 11 | +libphp_common.la: $(PHP_GLOBAL_OBJS) |
56d9d471 | 12 | + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) |
b3f9db84 | 13 | + $(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la |
7011c01c | 14 | + |
71398d48 | 15 | +libphp4.la: libphp_common.la $(PHP_SAPI_OBJS) |
bfeee772 | 16 | + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ |
71398d48 | 17 | |
18 | libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) | |
19 | $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so | |
b3f9db84 | 20 | @@ -25,11 +28,13 @@ |
0be0595c | 21 | |
92ea19de AG |
22 | install-sapi: $(OVERALL_TARGET) |
23 | @echo "Installing PHP SAPI module: $(PHP_SAPI)" | |
71398d48 | 24 | + -@$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1 |
25 | + -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 | |
404e6f35 | 26 | -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
71398d48 | 27 | - -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \ |
0be0595c | 28 | + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \ |
92ea19de | 29 | for i in 0.0.0 0.0 0; do \ |
71398d48 | 30 | - if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \ |
31 | - $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \ | |
0be0595c JR |
32 | + if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \ |
33 | + $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \ | |
92ea19de AG |
34 | break; \ |
35 | fi; \ | |
36 | done; \ | |
b3f9db84 | 37 | @@ -284,7 +289,7 @@ |
2a9b5aee ER |
38 | find . -name \*.a | xargs rm -f |
39 | find . -name \*.so | xargs rm -f | |
40 | find . -name .libs -a -type d|xargs rm -rf | |
41 | - rm -f libphp4.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* | |
42 | + rm -f libphp4.la libphp_common.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* | |
43 | ||
44 | distclean: clean | |
45 | rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php4.spec sapi/apache/libphp4.module buildmk.stamp | |
71398d48 | 46 | --- php-4.3.3RC2.orig/sapi/cgi/Makefile.frag Wed Jul 2 03:06:29 2003 |
47 | +++ php-4.3.3RC2-shared/sapi/cgi/Makefile.frag Sat Aug 2 22:53:38 2003 | |
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) | |
71398d48 | 52 | --- php-4.3.3RC2.orig/sapi/cgi/config9.m4 Wed Jul 2 04:48:16 2003 |
53 | +++ php-4.3.3RC2-shared/sapi/cgi/config9.m4 Sat Aug 2 22:54:51 2003 | |
92ea19de | 54 | @@ -156,7 +156,7 @@ |
71398d48 | 55 | BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" |
7a3247d2 JB |
56 | ;; |
57 | *) | |
15224647 ER |
58 | - 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)" |
59 | + 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)" | |
7a3247d2 JB |
60 | ;; |
61 | esac | |
62 | ||
71398d48 | 63 | --- php-4.3.3RC2.orig/sapi/cli/Makefile.frag Wed Feb 12 05:39:30 2003 |
64 | +++ php-4.3.3RC2-shared/sapi/cli/Makefile.frag Sat Aug 2 22:53:53 2003 | |
65 | @@ -1,4 +1,4 @@ | |
66 | -$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) | |
67 | +$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS) | |
68 | $(BUILD_CLI) | |
69 | ||
70 | install-cli: $(SAPI_CLI_PATH) | |
71398d48 | 71 | --- php-4.3.3RC2.orig/sapi/cli/config.m4 Wed Feb 12 05:39:30 2003 |
72 | +++ php-4.3.3RC2-shared/sapi/cli/config.m4 Sat Aug 2 22:55:15 2003 | |
92ea19de | 73 | @@ -27,7 +27,7 @@ |
71398d48 | 74 | BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" |
7a3247d2 JB |
75 | ;; |
76 | *) | |
15224647 ER |
77 | - 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)" |
78 | + 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)" | |
7a3247d2 JB |
79 | ;; |
80 | esac | |
71398d48 | 81 | INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php" |