]>
Commit | Line | Data |
---|---|---|
791b59e4 JR |
1 | diff -urNp -x '*.orig' php-5.6.40.org/Makefile.global php-5.6.40/Makefile.global |
2 | --- php-5.6.40.org/Makefile.global 2019-01-09 10:54:13.000000000 +0100 | |
3 | +++ php-5.6.40/Makefile.global 2021-08-23 23:18:33.545847429 +0200 | |
4 | @@ -15,8 +15,12 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND | |
5 | ||
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) | |
791b59e4 | 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; \ | |
791b59e4 JR |
33 | diff -urNp -x '*.orig' php-5.6.40.org/sapi/cgi/Makefile.frag php-5.6.40/sapi/cgi/Makefile.frag |
34 | --- php-5.6.40.org/sapi/cgi/Makefile.frag 2019-01-09 10:54:13.000000000 +0100 | |
35 | +++ php-5.6.40/sapi/cgi/Makefile.frag 2021-08-23 23:18:33.549180758 +0200 | |
36 | @@ -1,6 +1,6 @@ | |
37 | cgi: $(SAPI_CGI_PATH) | |
38 | ||
39 | -$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS) | |
40 | +$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS) | |
41 | $(BUILD_CGI) | |
42 | ||
43 | install-cgi: $(SAPI_CGI_PATH) | |
44 | diff -urNp -x '*.orig' php-5.6.40.org/sapi/cgi/config9.m4 php-5.6.40/sapi/cgi/config9.m4 | |
45 | --- php-5.6.40.org/sapi/cgi/config9.m4 2019-01-09 10:54:13.000000000 +0100 | |
46 | +++ php-5.6.40/sapi/cgi/config9.m4 2021-08-23 23:18:33.545847429 +0200 | |
47 | @@ -64,7 +64,7 @@ if test "$PHP_CGI" != "no"; then | |
02d2dcbb | 48 | 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 | 49 | ;; |
50 | *) | |
02d2dcbb ER |
51 | - 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)" |
52 | + 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 | 53 | ;; |
54 | esac | |
55 | ||
791b59e4 JR |
56 | diff -urNp -x '*.orig' php-5.6.40.org/sapi/cli/Makefile.frag php-5.6.40/sapi/cli/Makefile.frag |
57 | --- php-5.6.40.org/sapi/cli/Makefile.frag 2019-01-09 10:54:13.000000000 +0100 | |
58 | +++ php-5.6.40/sapi/cli/Makefile.frag 2021-08-23 23:18:33.549180758 +0200 | |
02d2dcbb | 59 | @@ -1,6 +1,6 @@ |
791b59e4 | 60 | cli: $(SAPI_CLI_PATH) |
02d2dcbb | 61 | |
791b59e4 JR |
62 | -$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) |
63 | +$(SAPI_CLI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) | |
64 | $(BUILD_CLI) | |
02d2dcbb | 65 | |
791b59e4 JR |
66 | install-cli: $(SAPI_CLI_PATH) |
67 | diff -urNp -x '*.orig' php-5.6.40.org/sapi/cli/config.m4 php-5.6.40/sapi/cli/config.m4 | |
68 | --- php-5.6.40.org/sapi/cli/config.m4 2019-01-09 10:54:13.000000000 +0100 | |
69 | +++ php-5.6.40/sapi/cli/config.m4 2021-08-23 23:18:33.549180758 +0200 | |
70 | @@ -48,7 +48,7 @@ if test "$PHP_CLI" != "no"; then | |
02d2dcbb | 71 | 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 | 72 | ;; |
73 | *) | |
02d2dcbb ER |
74 | - 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)" |
75 | + 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 | 76 | ;; |
77 | esac | |
02d2dcbb | 78 | |
791b59e4 JR |
79 | diff -urNp -x '*.orig' php-5.6.40.org/sapi/litespeed/Makefile.frag php-5.6.40/sapi/litespeed/Makefile.frag |
80 | --- php-5.6.40.org/sapi/litespeed/Makefile.frag 2019-01-09 10:54:13.000000000 +0100 | |
81 | +++ php-5.6.40/sapi/litespeed/Makefile.frag 2021-08-23 23:18:33.549180758 +0200 | |
c0240cb1 | 82 | @@ -1,6 +1,6 @@ |
791b59e4 | 83 | litespeed: $(SAPI_LITESPEED_PATH) |
c0240cb1 | 84 | |
791b59e4 JR |
85 | -$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS) |
86 | +$(SAPI_LITESPEED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS) | |
87 | $(BUILD_LITESPEED) | |
c0240cb1 | 88 | |
791b59e4 JR |
89 | install-litespeed: $(SAPI_LITESPEED_PATH) |
90 | diff -urNp -x '*.orig' php-5.6.40.org/sapi/litespeed/config.m4 php-5.6.40/sapi/litespeed/config.m4 | |
91 | --- php-5.6.40.org/sapi/litespeed/config.m4 2019-01-09 10:54:13.000000000 +0100 | |
92 | +++ php-5.6.40/sapi/litespeed/config.m4 2021-08-23 23:18:33.549180758 +0200 | |
93 | @@ -17,10 +17,10 @@ if test "$PHP_LITESPEED" != "no"; then | |
94 | ;; | |
95 | *cygwin*) | |
96 | SAPI_LITESPEED_PATH=sapi/litespeed/php.exe | |
97 | - 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)" | |
98 | + 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)" | |
99 | ;; | |
100 | *) | |
101 | - 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)" | |
102 | + 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)" | |
103 | ;; | |
104 | esac | |
105 | ||
106 | diff -urNp -x '*.orig' php-5.6.40.org/sapi/phpdbg/Makefile.frag php-5.6.40/sapi/phpdbg/Makefile.frag | |
107 | --- php-5.6.40.org/sapi/phpdbg/Makefile.frag 2019-01-09 10:54:13.000000000 +0100 | |
108 | +++ php-5.6.40/sapi/phpdbg/Makefile.frag 2021-08-23 23:18:33.549180758 +0200 | |
109 | @@ -2,10 +2,10 @@ phpdbg: $(BUILD_BINARY) | |
818ca16d ER |
110 | |
111 | phpdbg-shared: $(BUILD_SHARED) | |
112 | ||
113 | -$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
114 | +$(BUILD_SHARED): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
115 | $(BUILD_PHPDBG_SHARED) | |
116 | ||
117 | -$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
118 | +$(BUILD_BINARY): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS) | |
119 | $(BUILD_PHPDBG) | |
120 | ||
121 | %.c: %.y | |
791b59e4 JR |
122 | diff -urNp -x '*.orig' php-5.6.40.org/sapi/phpdbg/config.m4 php-5.6.40/sapi/phpdbg/config.m4 |
123 | --- php-5.6.40.org/sapi/phpdbg/config.m4 2019-01-09 10:54:13.000000000 +0100 | |
124 | +++ php-5.6.40/sapi/phpdbg/config.m4 2021-08-23 23:18:33.549180758 +0200 | |
125 | @@ -37,7 +37,7 @@ if test "$PHP_PHPDBG" != "no"; then | |
818ca16d ER |
126 | |
127 | BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ | |
128 | \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ | |
129 | - \$(PHP_GLOBAL_OBJS) \ | |
130 | + libphp_common.la \ | |
131 | \$(PHP_BINARY_OBJS) \ | |
132 | \$(PHP_PHPDBG_OBJS) \ | |
133 | \$(EXTRA_LIBS) \ | |
791b59e4 | 134 | @@ -47,7 +47,7 @@ if test "$PHP_PHPDBG" != "no"; then |
818ca16d ER |
135 | |
136 | BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \ | |
137 | \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ | |
138 | - \$(PHP_GLOBAL_OBJS) \ | |
139 | + libphp_common.la \ | |
140 | \$(PHP_BINARY_OBJS) \ | |
141 | \$(PHP_PHPDBG_OBJS) \ | |
142 | \$(EXTRA_LIBS) \ |