]>
Commit | Line | Data |
---|---|---|
45fae571 ER |
1 | --- php-src-PHP-7.4/configure.ac~ 2019-05-25 12:37:30.000000000 +0300 |
2 | +++ php-src-PHP-7.4/configure.ac 2019-05-26 10:07:36.385580763 +0300 | |
3 | @@ -202,6 +202,9 @@ | |
4 | dnl Check for -R, etc. switch. | |
534cc418 ER |
5 | PHP_RUNPATH_SWITCH |
6 | ||
7 | +dnl Always shared | |
8 | +PHP_BUILD_SHARED | |
9 | + | |
45fae571 | 10 | dnl Checks for some support/generator progs. |
534cc418 | 11 | PHP_PROG_AWK |
45fae571 | 12 | PHP_PROG_BISON([3.0.0]) |
d9f1af78 ER |
13 | --- php-8.0.0beta4/build/Makefile.global~ 2020-09-28 07:54:00.000000000 +0300 |
14 | +++ php-8.0.0beta4/build/Makefile.global 2020-09-28 07:54:42.203157017 +0300 | |
d4364ecc | 15 | @@ -13,8 +13,12 @@ |
a17aa399 AG |
16 | |
17 | build-binaries: $(PHP_BINARIES) | |
c0240cb1 | 18 | |
d9f1af78 ER |
19 | -libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) |
20 | - $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ | |
0903df6e | 21 | +libphp_common.la: $(PHP_GLOBAL_OBJS) |
d9f1af78 | 22 | + $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) |
d4364ecc ER |
23 | + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 |
24 | + | |
d9f1af78 | 25 | +libphp.la: libphp_common.la $(PHP_SAPI_OBJS) |
d4364ecc | 26 | + $(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 $@ |
c0240cb1 | 27 | -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 |
28 | ||
a17aa399 | 29 | libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) |
d9f1af78 | 30 | @@ -31,10 +31,10 @@ |
c0240cb1 | 31 | install-sapi: $(OVERALL_TARGET) |
32 | @echo "Installing PHP SAPI module: $(PHP_SAPI)" | |
33 | -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) | |
d9f1af78 | 34 | - -@if test ! -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); then \ |
c0240cb1 | 35 | + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); then \ |
36 | for i in 0.0.0 0.0 0; do \ | |
d9f1af78 ER |
37 | - if test -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ |
38 | - $(LN_S) $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); \ | |
c0240cb1 | 39 | + if test -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ |
40 | + $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \ | |
41 | break; \ | |
42 | fi; \ | |
43 | done; \ | |
d9f1af78 ER |
44 | --- php-8.0.0beta4/sapi/cgi/config9.m4~ 2020-09-15 21:36:33.000000000 +0300 |
45 | +++ php-8.0.0beta4/sapi/cgi/config9.m4 2020-09-28 08:00:34.341402924 +0300 | |
baf381c1 | 46 | @@ -55,7 +55,7 @@ |
d9f1af78 | 47 | BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" |
c0240cb1 | 48 | ;; |
49 | *) | |
d9f1af78 ER |
50 | - BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" |
51 | + BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" | |
c0240cb1 | 52 | ;; |
53 | esac | |
54 | ||
00938eac ER |
55 | --- php-7.0.0beta1/sapi/cgi/Makefile.frag~ 2015-07-10 15:11:43.000000000 +0300 |
56 | +++ php-7.0.0beta1/sapi/cgi/Makefile.frag 2015-07-13 16:03:56.810212555 +0300 | |
02d2dcbb ER |
57 | @@ -1,6 +1,6 @@ |
58 | cgi: $(SAPI_CGI_PATH) | |
59 | ||
00938eac ER |
60 | -$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS) |
61 | +$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS) | |
c0240cb1 | 62 | $(BUILD_CGI) |
02d2dcbb ER |
63 | |
64 | install-cgi: $(SAPI_CGI_PATH) | |
d9f1af78 ER |
65 | --- php-8.0.0beta4/sapi/cli/config.m4~ 2020-09-15 21:36:33.000000000 +0300 |
66 | +++ php-8.0.0beta4/sapi/cli/config.m4 2020-09-28 10:50:26.427391375 +0300 | |
baf381c1 | 67 | @@ -42,7 +42,7 @@ |
d9f1af78 | 68 | BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" |
c0240cb1 | 69 | ;; |
70 | *) | |
d9f1af78 | 71 | - BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" |
6cfd6f4c | 72 | + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)" |
c0240cb1 | 73 | ;; |
74 | esac | |
02d2dcbb ER |
75 | |
76 | --- php-5.4.0alpha2/sapi/cli/Makefile.frag~ 2011-01-24 00:40:35.000000000 +0200 | |
77 | +++ php-5.4.0alpha2/sapi/cli/Makefile.frag 2011-08-01 12:22:28.627926487 +0300 | |
c0240cb1 | 78 | @@ -1,6 +1,6 @@ |
79 | cli: $(SAPI_CLI_PATH) | |
80 | ||
02d2dcbb ER |
81 | -$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) |
82 | +$(SAPI_CLI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) | |
c0240cb1 | 83 | $(BUILD_CLI) |
84 | ||
85 | install-cli: $(SAPI_CLI_PATH) | |
4fd55489 ER |
86 | --- php-7.0.0RC3/sapi/phpdbg/Makefile.frag~ 2015-09-16 15:49:38.000000000 +0300 |
87 | +++ php-7.0.0RC3/sapi/phpdbg/Makefile.frag 2015-09-27 21:24:44.370536565 +0300 | |
88 | @@ -2,10 +2,10 @@ | |
89 | ||
90 | phpdbg-shared: $(BUILD_SHARED) | |
91 | ||
92 | -$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
93 | +$(BUILD_SHARED): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
94 | $(BUILD_PHPDBG_SHARED) | |
95 | ||
96 | -$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
97 | +$(BUILD_BINARY): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
98 | $(BUILD_PHPDBG) | |
99 | ||
100 | %.c: %.y | |
d9f1af78 ER |
101 | --- php-8.0.0beta4/sapi/phpdbg/config.m4~ 2020-10-02 16:05:45.000000000 +0300 |
102 | +++ php-8.0.0beta4/sapi/phpdbg/config.m4 2020-10-02 17:29:48.820717591 +0300 | |
baf381c1 ER |
103 | @@ -63,7 +63,7 @@ |
104 | ||
4fd55489 ER |
105 | BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ |
106 | \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ | |
d9f1af78 | 107 | - \$(PHP_GLOBAL_OBJS:.lo=.o) \ |
4fd55489 | 108 | + libphp_common.la \ |
d9f1af78 ER |
109 | \$(PHP_BINARY_OBJS:.lo=.o) \ |
110 | \$(PHP_PHPDBG_OBJS:.lo=.o) \ | |
4fd55489 ER |
111 | \$(EXTRA_LIBS) \ |
112 | @@ -50,7 +50,7 @@ | |
113 | ||
114 | BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \ | |
115 | \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ | |
116 | - \$(PHP_GLOBAL_OBJS) \ | |
117 | + libphp_common.la \ | |
118 | \$(PHP_BINARY_OBJS) \ | |
119 | \$(PHP_PHPDBG_OBJS) \ | |
120 | \$(EXTRA_LIBS) \ | |
121 | --- php-7.0.0RC3/sapi/litespeed/Makefile.frag~ 2015-09-16 15:49:38.000000000 +0300 | |
122 | +++ php-7.0.0RC3/sapi/litespeed/Makefile.frag 2015-09-27 21:26:36.783039512 +0300 | |
123 | @@ -1,6 +1,6 @@ | |
124 | litespeed: $(SAPI_LITESPEED_PATH) | |
125 | ||
126 | -$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS) | |
127 | +$(SAPI_LITESPEED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS) | |
128 | $(BUILD_LITESPEED) | |
129 | ||
130 | install-litespeed: $(SAPI_LITESPEED_PATH) | |
d9f1af78 ER |
131 | --- php-8.0.0beta4/sapi/litespeed/config.m4~ 2020-09-15 21:36:33.000000000 +0300 |
132 | +++ php-8.0.0beta4/sapi/litespeed/config.m4 2020-10-02 17:31:51.010389005 +0300 | |
baf381c1 ER |
133 | @@ -18,7 +18,7 @@ |
134 | 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)" | |
4fd55489 ER |
135 | ;; |
136 | *) | |
d9f1af78 ER |
137 | - BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" |
138 | + BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" | |
4fd55489 ER |
139 | ;; |
140 | esac | |
141 | ||
d9f1af78 ER |
142 | --- php-8.0.0beta4/sapi/fpm/config.m4~ 2020-09-15 21:36:33.000000000 +0300 |
143 | +++ php-8.0.0beta4/sapi/fpm/config.m4 2020-10-02 17:33:05.217571527 +0300 | |
144 | @@ -659,7 +659,7 @@ | |
145 | BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" | |
8ce4914e ER |
146 | ;; |
147 | *) | |
d9f1af78 ER |
148 | - BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" |
149 | + BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" | |
8ce4914e ER |
150 | ;; |
151 | esac | |
152 | ||
153 | --- php-7.0.0beta1/sapi/fpm/Makefile.frag~ 2015-07-15 13:54:11.000000000 +0300 | |
154 | +++ php-7.0.0beta1/sapi/fpm/Makefile.frag 2015-07-15 13:56:12.116885111 +0300 | |
155 | @@ -1,6 +1,6 @@ | |
156 | fpm: $(SAPI_FPM_PATH) | |
157 | ||
158 | -$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_FPM_OBJS) | |
159 | +$(SAPI_FPM_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_FPM_OBJS) $(SAPI_EXTRA_DEPS) | |
160 | $(BUILD_FPM) | |
161 | ||
162 | install-fpm: $(SAPI_FPM_PATH) |