[packages/php.git] / php-shared.patch

diff -urNp -x '*.orig' php-7.2.34.org/Makefile.global php-7.2.34/Makefile.global
--- php-7.2.34.org/Makefile.global	2020-09-30 07:15:55.000000000 +0200
+++ php-7.2.34/Makefile.global	2021-08-24 01:06:38.486636077 +0200
@@ -15,8 +15,12 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND
 
 build-binaries: $(PHP_BINARIES)
 
-libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-	$(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 $@
+libphp_common.la: $(PHP_GLOBAL_OBJS)
+	$(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)
+	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+
+libphp$(PHP_MAJOR_VERSION).la: libphp_common.la $(PHP_SAPI_OBJS)
+	$(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 $@
 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
 
 libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
@@ -27,10 +31,10 @@ install: $(all_targets) $(install_target
 install-sapi: $(OVERALL_TARGET)
 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	-@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
+	-@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); then \
 		for i in 0.0.0 0.0 0; do \
-			if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
-				$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
+			if test -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+				$(LN_S) $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \
 				break; \
 			fi; \
 		done; \
diff -urNp -x '*.orig' php-7.2.34.org/configure.ac php-7.2.34/configure.ac
--- php-7.2.34.org/configure.ac	2020-09-30 07:15:50.000000000 +0200
+++ php-7.2.34/configure.ac	2021-08-24 01:06:38.486636077 +0200
@@ -212,6 +212,9 @@ PHP_ARG_ENABLE(rpath, whether to enable
 dnl check for -R, etc. switch
 PHP_RUNPATH_SWITCH
 
+dnl Always shared
+PHP_BUILD_SHARED
+
 dnl Checks for some support/generator progs
 PHP_PROG_AWK
 PHP_PROG_BISON
diff -urNp -x '*.orig' php-7.2.34.org/sapi/cgi/Makefile.frag php-7.2.34/sapi/cgi/Makefile.frag
--- php-7.2.34.org/sapi/cgi/Makefile.frag	2020-09-30 07:15:50.000000000 +0200
+++ php-7.2.34/sapi/cgi/Makefile.frag	2021-08-24 01:06:38.486636077 +0200
@@ -1,6 +1,6 @@
 cgi: $(SAPI_CGI_PATH)
 
-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
+$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
 	$(BUILD_CGI)
 
 install-cgi: $(SAPI_CGI_PATH)
diff -urNp -x '*.orig' php-7.2.34.org/sapi/cgi/config9.m4 php-7.2.34/sapi/cgi/config9.m4
--- php-7.2.34.org/sapi/cgi/config9.m4	2020-09-30 07:15:50.000000000 +0200
+++ php-7.2.34/sapi/cgi/config9.m4	2021-08-24 01:06:38.486636077 +0200
@@ -64,7 +64,7 @@ if test "$PHP_CGI" != "no"; then
         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)"
       ;;
       *)
-        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)"
+        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)"
       ;;
     esac
 
diff -urNp -x '*.orig' php-7.2.34.org/sapi/cli/Makefile.frag php-7.2.34/sapi/cli/Makefile.frag
--- php-7.2.34.org/sapi/cli/Makefile.frag	2020-09-30 07:15:50.000000000 +0200
+++ php-7.2.34/sapi/cli/Makefile.frag	2021-08-24 01:06:38.486636077 +0200
@@ -1,6 +1,6 @@
 cli: $(SAPI_CLI_PATH)
 
-$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
+$(SAPI_CLI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
 	$(BUILD_CLI)
 
 install-cli: $(SAPI_CLI_PATH)
diff -urNp -x '*.orig' php-7.2.34.org/sapi/cli/config.m4 php-7.2.34/sapi/cli/config.m4
--- php-7.2.34.org/sapi/cli/config.m4	2020-09-30 07:15:50.000000000 +0200
+++ php-7.2.34/sapi/cli/config.m4	2021-08-24 01:06:38.486636077 +0200
@@ -45,7 +45,7 @@ if test "$PHP_CLI" != "no"; then
     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)"
     ;;
   *)
-    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)"
+    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)"
     ;;
   esac
 
diff -urNp -x '*.orig' php-7.2.34.org/sapi/litespeed/Makefile.frag php-7.2.34/sapi/litespeed/Makefile.frag
--- php-7.2.34.org/sapi/litespeed/Makefile.frag	2020-09-30 07:15:50.000000000 +0200
+++ php-7.2.34/sapi/litespeed/Makefile.frag	2021-08-24 01:06:38.486636077 +0200
@@ -1,6 +1,6 @@
 litespeed: $(SAPI_LITESPEED_PATH)
 
-$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
+$(SAPI_LITESPEED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
 	$(BUILD_LITESPEED)
 
 install-litespeed: $(SAPI_LITESPEED_PATH)
diff -urNp -x '*.orig' php-7.2.34.org/sapi/litespeed/config.m4 php-7.2.34/sapi/litespeed/config.m4
--- php-7.2.34.org/sapi/litespeed/config.m4	2020-09-30 07:15:50.000000000 +0200
+++ php-7.2.34/sapi/litespeed/config.m4	2021-08-24 01:06:38.486636077 +0200
@@ -17,10 +17,10 @@ if test "$PHP_LITESPEED" != "no"; then
     ;;
   *cygwin*)
     SAPI_LITESPEED_PATH=sapi/litespeed/php.exe
-    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)"
+    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)"
     ;;
   *)
-    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)"
+    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)"
     ;;
   esac
 
diff -urNp -x '*.orig' php-7.2.34.org/sapi/phpdbg/Makefile.frag php-7.2.34/sapi/phpdbg/Makefile.frag
--- php-7.2.34.org/sapi/phpdbg/Makefile.frag	2020-09-30 07:15:50.000000000 +0200
+++ php-7.2.34/sapi/phpdbg/Makefile.frag	2021-08-24 01:06:38.486636077 +0200
@@ -2,10 +2,10 @@ phpdbg: $(BUILD_BINARY)
 
 phpdbg-shared: $(BUILD_SHARED)
 
-$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
+$(BUILD_SHARED): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 	$(BUILD_PHPDBG_SHARED)
 
-$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
+$(BUILD_BINARY): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 	$(BUILD_PHPDBG)
 
 %.c: %.y
diff -urNp -x '*.orig' php-7.2.34.org/sapi/phpdbg/config.m4 php-7.2.34/sapi/phpdbg/config.m4
--- php-7.2.34.org/sapi/phpdbg/config.m4	2020-09-30 07:15:50.000000000 +0200
+++ php-7.2.34/sapi/phpdbg/config.m4	2021-08-24 01:06:38.486636077 +0200
@@ -52,7 +52,7 @@ if test "$BUILD_PHPDBG" = "" && test "$P
 
   BUILD_PHPDBG="\$(LIBTOOL) --mode=link \
         \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
-                \$(PHP_GLOBAL_OBJS) \
+                libphp_common.la \
                 \$(PHP_BINARY_OBJS) \
                 \$(PHP_PHPDBG_OBJS) \
                 \$(EXTRA_LIBS) \
@@ -62,7 +62,7 @@ if test "$BUILD_PHPDBG" = "" && test "$P
 
   BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \
         \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
-                \$(PHP_GLOBAL_OBJS) \
+                libphp_common.la \
                 \$(PHP_BINARY_OBJS) \
                 \$(PHP_PHPDBG_OBJS) \
                 \$(EXTRA_LIBS) \
Commit	Line	Data
562cdd31 JR	1	diff -urNp -x '*.orig' php-7.2.34.org/Makefile.global php-7.2.34/Makefile.global
	2	--- php-7.2.34.org/Makefile.global 2020-09-30 07:15:55.000000000 +0200
	3	+++ php-7.2.34/Makefile.global 2021-08-24 01:06:38.486636077 +0200
	4	@@ -15,8 +15,12 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND
534cc418	5
562cdd31	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)
562cdd31	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; \
562cdd31 JR	33	diff -urNp -x '*.orig' php-7.2.34.org/configure.ac php-7.2.34/configure.ac
	34	--- php-7.2.34.org/configure.ac 2020-09-30 07:15:50.000000000 +0200
	35	+++ php-7.2.34/configure.ac 2021-08-24 01:06:38.486636077 +0200
	36	@@ -212,6 +212,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.2.34.org/sapi/cgi/Makefile.frag php-7.2.34/sapi/cgi/Makefile.frag
	47	--- php-7.2.34.org/sapi/cgi/Makefile.frag 2020-09-30 07:15:50.000000000 +0200
	48	+++ php-7.2.34/sapi/cgi/Makefile.frag 2021-08-24 01:06:38.486636077 +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.2.34.org/sapi/cgi/config9.m4 php-7.2.34/sapi/cgi/config9.m4
	58	--- php-7.2.34.org/sapi/cgi/config9.m4 2020-09-30 07:15:50.000000000 +0200
	59	+++ php-7.2.34/sapi/cgi/config9.m4 2021-08-24 01:06:38.486636077 +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	;;
c0240cb1	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)"
00938eac ER	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
562cdd31 JR	69	diff -urNp -x '*.orig' php-7.2.34.org/sapi/cli/Makefile.frag php-7.2.34/sapi/cli/Makefile.frag
	70	--- php-7.2.34.org/sapi/cli/Makefile.frag 2020-09-30 07:15:50.000000000 +0200
	71	+++ php-7.2.34/sapi/cli/Makefile.frag 2021-08-24 01:06:38.486636077 +0200
02d2dcbb	72	@@ -1,6 +1,6 @@
562cdd31	73	cli: $(SAPI_CLI_PATH)
02d2dcbb	74
562cdd31 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
562cdd31 JR	79	install-cli: $(SAPI_CLI_PATH)
	80	diff -urNp -x '*.orig' php-7.2.34.org/sapi/cli/config.m4 php-7.2.34/sapi/cli/config.m4
	81	--- php-7.2.34.org/sapi/cli/config.m4 2020-09-30 07:15:50.000000000 +0200
	82	+++ php-7.2.34/sapi/cli/config.m4 2021-08-24 01:06:38.486636077 +0200
	83	@@ -45,7 +45,7 @@ if test "$PHP_CLI" != "no"; then
	84	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	85	;;
c0240cb1	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)"
02d2dcbb ER	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	;;
c0240cb1	90	esac
02d2dcbb	91
562cdd31 JR	92	diff -urNp -x '*.orig' php-7.2.34.org/sapi/litespeed/Makefile.frag php-7.2.34/sapi/litespeed/Makefile.frag
	93	--- php-7.2.34.org/sapi/litespeed/Makefile.frag 2020-09-30 07:15:50.000000000 +0200
	94	+++ php-7.2.34/sapi/litespeed/Makefile.frag 2021-08-24 01:06:38.486636077 +0200
c0240cb1	95	@@ -1,6 +1,6 @@
562cdd31	96	litespeed: $(SAPI_LITESPEED_PATH)
c0240cb1	97
562cdd31 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
562cdd31 JR	102	install-litespeed: $(SAPI_LITESPEED_PATH)
	103	diff -urNp -x '*.orig' php-7.2.34.org/sapi/litespeed/config.m4 php-7.2.34/sapi/litespeed/config.m4
	104	--- php-7.2.34.org/sapi/litespeed/config.m4 2020-09-30 07:15:50.000000000 +0200
	105	+++ php-7.2.34/sapi/litespeed/config.m4 2021-08-24 01:06:38.486636077 +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.2.34.org/sapi/phpdbg/Makefile.frag php-7.2.34/sapi/phpdbg/Makefile.frag
	120	--- php-7.2.34.org/sapi/phpdbg/Makefile.frag 2020-09-30 07:15:50.000000000 +0200
	121	+++ php-7.2.34/sapi/phpdbg/Makefile.frag 2021-08-24 01:06:38.486636077 +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
562cdd31 JR	135	diff -urNp -x '*.orig' php-7.2.34.org/sapi/phpdbg/config.m4 php-7.2.34/sapi/phpdbg/config.m4
	136	--- php-7.2.34.org/sapi/phpdbg/config.m4 2020-09-30 07:15:50.000000000 +0200
	137	+++ php-7.2.34/sapi/phpdbg/config.m4 2021-08-24 01:06:38.486636077 +0200
	138	@@ -52,7 +52,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) \
562cdd31	147	@@ -62,7 +62,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) \