]>
Commit | Line | Data |
---|---|---|
c0240cb1 | 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 @@ | |
4 | ||
5 | build-modules: $(PHP_MODULES) | |
6 | ||
7 | -libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) | |
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 $@ | |
9 | +libphp_common.la: $(PHP_GLOBAL_OBJS) | |
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) | |
11 | + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 | |
12 | + | |
13 | +libphp$(PHP_MAJOR_VERSION).la: libphp_common.la $(PHP_SAPI_OBJS) | |
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 $@ | |
15 | -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 | |
16 | ||
17 | libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) | |
18 | @@ -25,10 +29,10 @@ | |
19 | install-sapi: $(OVERALL_TARGET) | |
20 | @echo "Installing PHP SAPI module: $(PHP_SAPI)" | |
21 | -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) | |
22 | - -@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \ | |
23 | + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); then \ | |
24 | for i in 0.0.0 0.0 0; do \ | |
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); \ | |
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); \ | |
29 | break; \ | |
30 | fi; \ | |
31 | done; \ | |
02d2dcbb ER |
32 | --- php-5.4.0alpha2/sapi/cgi/config9.m4~ 2010-11-14 01:13:07.000000000 +0200 |
33 | +++ php-5.4.0alpha2/sapi/cgi/config9.m4 2011-08-01 10:28:47.495056372 +0300 | |
34 | @@ -64,7 +64,7 @@ | |
35 | BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" | |
c0240cb1 | 36 | ;; |
37 | *) | |
02d2dcbb ER |
38 | - BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_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_BINARY_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" | |
c0240cb1 | 40 | ;; |
41 | esac | |
42 | ||
02d2dcbb ER |
43 | --- php-5.4.0alpha2/sapi/cgi/Makefile.frag~ 2010-11-14 01:13:07.000000000 +0200 |
44 | +++ php-5.4.0alpha2/sapi/cgi/Makefile.frag 2011-08-01 12:21:29.155180914 +0300 | |
45 | @@ -1,6 +1,6 @@ | |
46 | cgi: $(SAPI_CGI_PATH) | |
47 | ||
48 | -$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS) | |
49 | +$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS) | |
c0240cb1 | 50 | $(BUILD_CGI) |
02d2dcbb ER |
51 | |
52 | install-cgi: $(SAPI_CGI_PATH) | |
53 | --- php-5.4.0alpha2/sapi/cli/config.m4~ 2011-06-20 23:27:39.000000000 +0300 | |
54 | +++ php-5.4.0alpha2/sapi/cli/config.m4 2011-08-01 10:34:01.072624745 +0300 | |
55 | @@ -31,7 +31,7 @@ | |
56 | BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)" | |
c0240cb1 | 57 | ;; |
58 | *) | |
02d2dcbb ER |
59 | - BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" |
60 | + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" | |
c0240cb1 | 61 | ;; |
62 | esac | |
02d2dcbb ER |
63 | |
64 | --- php-5.4.0alpha2/sapi/cli/Makefile.frag~ 2011-01-24 00:40:35.000000000 +0200 | |
65 | +++ php-5.4.0alpha2/sapi/cli/Makefile.frag 2011-08-01 12:22:28.627926487 +0300 | |
c0240cb1 | 66 | @@ -1,6 +1,6 @@ |
67 | cli: $(SAPI_CLI_PATH) | |
68 | ||
02d2dcbb ER |
69 | -$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) |
70 | +$(SAPI_CLI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) | |
c0240cb1 | 71 | $(BUILD_CLI) |
72 | ||
73 | install-cli: $(SAPI_CLI_PATH) | |
818ca16d ER |
74 | --- php-7.0.0RC3/sapi/phpdbg/Makefile.frag~ 2015-09-16 15:49:38.000000000 +0300 |
75 | +++ php-7.0.0RC3/sapi/phpdbg/Makefile.frag 2015-09-27 21:24:44.370536565 +0300 | |
76 | @@ -2,10 +2,10 @@ | |
77 | ||
78 | phpdbg-shared: $(BUILD_SHARED) | |
79 | ||
80 | -$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
81 | +$(BUILD_SHARED): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
82 | $(BUILD_PHPDBG_SHARED) | |
83 | ||
84 | -$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
85 | +$(BUILD_BINARY): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
86 | $(BUILD_PHPDBG) | |
87 | ||
88 | %.c: %.y | |
89 | --- php-7.0.0RC3/sapi/phpdbg/config.m4~ 2015-09-16 15:49:38.000000000 +0300 | |
90 | +++ php-7.0.0RC3/sapi/phpdbg/config.m4 2015-09-27 21:25:34.413134698 +0300 | |
91 | @@ -40,7 +40,7 @@ | |
92 | ||
93 | BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ | |
94 | \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ | |
95 | - \$(PHP_GLOBAL_OBJS) \ | |
96 | + libphp_common.la \ | |
97 | \$(PHP_BINARY_OBJS) \ | |
98 | \$(PHP_PHPDBG_OBJS) \ | |
99 | \$(EXTRA_LIBS) \ | |
100 | @@ -50,7 +50,7 @@ | |
101 | ||
102 | BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \ | |
103 | \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ | |
104 | - \$(PHP_GLOBAL_OBJS) \ | |
105 | + libphp_common.la \ | |
106 | \$(PHP_BINARY_OBJS) \ | |
107 | \$(PHP_PHPDBG_OBJS) \ | |
108 | \$(EXTRA_LIBS) \ | |
109 | --- php-7.0.0RC3/sapi/litespeed/Makefile.frag~ 2015-09-16 15:49:38.000000000 +0300 | |
110 | +++ php-7.0.0RC3/sapi/litespeed/Makefile.frag 2015-09-27 21:26:36.783039512 +0300 | |
111 | @@ -1,6 +1,6 @@ | |
112 | litespeed: $(SAPI_LITESPEED_PATH) | |
113 | ||
114 | -$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS) | |
115 | +$(SAPI_LITESPEED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS) | |
116 | $(BUILD_LITESPEED) | |
117 | ||
118 | install-litespeed: $(SAPI_LITESPEED_PATH) | |
119 | --- php-7.0.0RC3/sapi/litespeed/config.m4~ 2015-09-16 15:49:38.000000000 +0300 | |
120 | +++ php-7.0.0RC3/sapi/litespeed/config.m4 2015-09-27 21:27:36.182790123 +0300 | |
121 | @@ -17,10 +17,10 @@ | |
122 | ;; | |
123 | *cygwin*) | |
124 | SAPI_LITESPEED_PATH=sapi/litespeed/php.exe | |
125 | - BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" | |
126 | + BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" | |
127 | ;; | |
128 | *) | |
129 | - BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" | |
130 | + BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" | |
131 | ;; | |
132 | esac | |
133 |