]>
Commit | Line | Data |
---|---|---|
30ccba12 JR |
1 | diff -urNp -x '*.orig' php-7.1.33.org/Makefile.global php-7.1.33/Makefile.global |
2 | --- php-7.1.33.org/Makefile.global 2019-10-22 18:59:36.000000000 +0200 | |
3 | +++ php-7.1.33/Makefile.global 2021-08-23 23:45:28.351836168 +0200 | |
4 | @@ -15,8 +15,12 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND | |
534cc418 | 5 | |
30ccba12 | 6 | build-binaries: $(PHP_BINARIES) |
c0240cb1 | 7 | |
8 | -libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) | |
9 | - $(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 $@ | |
10 | +libphp_common.la: $(PHP_GLOBAL_OBJS) | |
11 | + $(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) | |
12 | + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 | |
13 | + | |
14 | +libphp$(PHP_MAJOR_VERSION).la: libphp_common.la $(PHP_SAPI_OBJS) | |
15 | + $(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 $@ | |
16 | -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 | |
17 | ||
18 | libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) | |
30ccba12 | 19 | @@ -27,10 +31,10 @@ install: $(all_targets) $(install_target |
c0240cb1 | 20 | install-sapi: $(OVERALL_TARGET) |
21 | @echo "Installing PHP SAPI module: $(PHP_SAPI)" | |
22 | -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) | |
23 | - -@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \ | |
24 | + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); then \ | |
25 | for i in 0.0.0 0.0 0; do \ | |
26 | - if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \ | |
27 | - $(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \ | |
28 | + if test -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ | |
29 | + $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \ | |
30 | break; \ | |
31 | fi; \ | |
32 | done; \ | |
30ccba12 JR |
33 | diff -urNp -x '*.orig' php-7.1.33.org/configure.in php-7.1.33/configure.in |
34 | --- php-7.1.33.org/configure.in 2019-10-22 18:59:36.000000000 +0200 | |
35 | +++ php-7.1.33/configure.in 2021-08-23 23:45:28.351836168 +0200 | |
36 | @@ -224,6 +224,9 @@ PHP_ARG_ENABLE(rpath, whether to enable | |
37 | dnl check for -R, etc. switch | |
38 | PHP_RUNPATH_SWITCH | |
39 | ||
40 | +dnl Always shared | |
41 | +PHP_BUILD_SHARED | |
42 | + | |
43 | dnl Checks for some support/generator progs | |
44 | PHP_PROG_AWK | |
45 | PHP_PROG_BISON | |
46 | diff -urNp -x '*.orig' php-7.1.33.org/sapi/cgi/Makefile.frag php-7.1.33/sapi/cgi/Makefile.frag | |
47 | --- php-7.1.33.org/sapi/cgi/Makefile.frag 2019-10-22 19:00:03.000000000 +0200 | |
48 | +++ php-7.1.33/sapi/cgi/Makefile.frag 2021-08-23 23:45:28.351836168 +0200 | |
49 | @@ -1,6 +1,6 @@ | |
50 | cgi: $(SAPI_CGI_PATH) | |
51 | ||
52 | -$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS) | |
53 | +$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS) | |
54 | $(BUILD_CGI) | |
55 | ||
56 | install-cgi: $(SAPI_CGI_PATH) | |
57 | diff -urNp -x '*.orig' php-7.1.33.org/sapi/cgi/config9.m4 php-7.1.33/sapi/cgi/config9.m4 | |
58 | --- php-7.1.33.org/sapi/cgi/config9.m4 2019-10-22 19:00:03.000000000 +0200 | |
59 | +++ php-7.1.33/sapi/cgi/config9.m4 2021-08-23 23:45:28.351836168 +0200 | |
60 | @@ -64,7 +64,7 @@ if test "$PHP_CGI" != "no"; then | |
00938eac | 61 | 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 | 62 | ;; |
63 | *) | |
00938eac ER |
64 | - 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_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" |
65 | + 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_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" | |
c0240cb1 | 66 | ;; |
67 | esac | |
68 | ||
30ccba12 JR |
69 | diff -urNp -x '*.orig' php-7.1.33.org/sapi/cli/Makefile.frag php-7.1.33/sapi/cli/Makefile.frag |
70 | --- php-7.1.33.org/sapi/cli/Makefile.frag 2019-10-22 19:00:03.000000000 +0200 | |
71 | +++ php-7.1.33/sapi/cli/Makefile.frag 2021-08-23 23:45:28.351836168 +0200 | |
02d2dcbb | 72 | @@ -1,6 +1,6 @@ |
30ccba12 | 73 | cli: $(SAPI_CLI_PATH) |
02d2dcbb | 74 | |
30ccba12 JR |
75 | -$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) |
76 | +$(SAPI_CLI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) | |
77 | $(BUILD_CLI) | |
02d2dcbb | 78 | |
30ccba12 JR |
79 | install-cli: $(SAPI_CLI_PATH) |
80 | diff -urNp -x '*.orig' php-7.1.33.org/sapi/cli/config.m4 php-7.1.33/sapi/cli/config.m4 | |
81 | --- php-7.1.33.org/sapi/cli/config.m4 2019-10-22 19:00:03.000000000 +0200 | |
82 | +++ php-7.1.33/sapi/cli/config.m4 2021-08-23 23:45:28.351836168 +0200 | |
83 | @@ -48,7 +48,7 @@ if test "$PHP_CLI" != "no"; then | |
84 | 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 -lphp7lib -o \$(SAPI_CLI_PATH)" | |
c0240cb1 | 85 | ;; |
86 | *) | |
02d2dcbb ER |
87 | - 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)" |
88 | + 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 | 89 | ;; |
90 | esac | |
02d2dcbb | 91 | |
30ccba12 JR |
92 | diff -urNp -x '*.orig' php-7.1.33.org/sapi/litespeed/Makefile.frag php-7.1.33/sapi/litespeed/Makefile.frag |
93 | --- php-7.1.33.org/sapi/litespeed/Makefile.frag 2019-10-22 19:00:03.000000000 +0200 | |
94 | +++ php-7.1.33/sapi/litespeed/Makefile.frag 2021-08-23 23:45:28.351836168 +0200 | |
c0240cb1 | 95 | @@ -1,6 +1,6 @@ |
30ccba12 | 96 | litespeed: $(SAPI_LITESPEED_PATH) |
c0240cb1 | 97 | |
30ccba12 JR |
98 | -$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS) |
99 | +$(SAPI_LITESPEED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS) | |
100 | $(BUILD_LITESPEED) | |
c0240cb1 | 101 | |
30ccba12 JR |
102 | install-litespeed: $(SAPI_LITESPEED_PATH) |
103 | diff -urNp -x '*.orig' php-7.1.33.org/sapi/litespeed/config.m4 php-7.1.33/sapi/litespeed/config.m4 | |
104 | --- php-7.1.33.org/sapi/litespeed/config.m4 2019-10-22 19:00:03.000000000 +0200 | |
105 | +++ php-7.1.33/sapi/litespeed/config.m4 2021-08-23 23:45:28.351836168 +0200 | |
106 | @@ -17,10 +17,10 @@ if test "$PHP_LITESPEED" != "no"; then | |
107 | ;; | |
108 | *cygwin*) | |
109 | SAPI_LITESPEED_PATH=sapi/litespeed/php.exe | |
110 | - 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)" | |
111 | + 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)" | |
112 | ;; | |
113 | *) | |
114 | - 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)" | |
115 | + 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)" | |
116 | ;; | |
117 | esac | |
118 | ||
119 | diff -urNp -x '*.orig' php-7.1.33.org/sapi/phpdbg/Makefile.frag php-7.1.33/sapi/phpdbg/Makefile.frag | |
120 | --- php-7.1.33.org/sapi/phpdbg/Makefile.frag 2019-10-22 19:00:03.000000000 +0200 | |
121 | +++ php-7.1.33/sapi/phpdbg/Makefile.frag 2021-08-23 23:45:28.351836168 +0200 | |
122 | @@ -2,10 +2,10 @@ phpdbg: $(BUILD_BINARY) | |
4fd55489 ER |
123 | |
124 | phpdbg-shared: $(BUILD_SHARED) | |
125 | ||
126 | -$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
127 | +$(BUILD_SHARED): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
128 | $(BUILD_PHPDBG_SHARED) | |
129 | ||
130 | -$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
131 | +$(BUILD_BINARY): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
132 | $(BUILD_PHPDBG) | |
133 | ||
134 | %.c: %.y | |
30ccba12 JR |
135 | diff -urNp -x '*.orig' php-7.1.33.org/sapi/phpdbg/config.m4 php-7.1.33/sapi/phpdbg/config.m4 |
136 | --- php-7.1.33.org/sapi/phpdbg/config.m4 2019-10-22 19:00:03.000000000 +0200 | |
137 | +++ php-7.1.33/sapi/phpdbg/config.m4 2021-08-23 23:45:28.351836168 +0200 | |
138 | @@ -40,7 +40,7 @@ if test "$BUILD_PHPDBG" = "" && test "$P | |
139 | ||
4fd55489 ER |
140 | BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ |
141 | \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ | |
142 | - \$(PHP_GLOBAL_OBJS) \ | |
143 | + libphp_common.la \ | |
144 | \$(PHP_BINARY_OBJS) \ | |
145 | \$(PHP_PHPDBG_OBJS) \ | |
146 | \$(EXTRA_LIBS) \ | |
30ccba12 | 147 | @@ -50,7 +50,7 @@ if test "$BUILD_PHPDBG" = "" && test "$P |
4fd55489 ER |
148 | |
149 | BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \ | |
150 | \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ | |
151 | - \$(PHP_GLOBAL_OBJS) \ | |
152 | + libphp_common.la \ | |
153 | \$(PHP_BINARY_OBJS) \ | |
154 | \$(PHP_PHPDBG_OBJS) \ | |
155 | \$(EXTRA_LIBS) \ |