From 8b96ecd2b00401abf5299ca2610f825db70efef0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 3 Oct 2020 13:03:03 +0300 Subject: [PATCH] Update both-apxs.patch --- php-both-apxs.patch | 14 +++++++------- php.spec | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/php-both-apxs.patch b/php-both-apxs.patch index 3cba2ae..21260e6 100644 --- a/php-both-apxs.patch +++ b/php-both-apxs.patch @@ -1,15 +1,15 @@ ---- php-5.2.4/build/Makefile.global~ 2007-08-31 19:35:54.000000000 +0300 -+++ php-5.2.4/build/Makefile.global 2007-08-31 19:40:18.287528480 +0300 -@@ -21,6 +21,12 @@ - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +--- php-8.0.0beta4/build/Makefile.global~ 2020-10-03 12:59:22.000000000 +0300 ++++ php-8.0.0beta4/build/Makefile.global 2020-10-03 13:02:40.788491363 +0300 +@@ -23,6 +23,12 @@ + $(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 +$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS) -+ $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ ++ $(LIBTOOL) --mode=link $(CC) -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 + +libtool-sapi: $(LIBTOOL_SAPI) + - libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp$(PHP_MAJOR_VERSION).so + libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) + $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp.so diff --git a/php.spec b/php.spec index 870530c..503df5a 100644 --- a/php.spec +++ b/php.spec @@ -1869,7 +1869,7 @@ cp -p php.ini-production php.ini #%patch17 -p1 -b readline %patch18 -p1 %patch21 -p1 -#%patch22 -p1 -b .both-apxs +%patch22 -p1 %patch23 -p1 #%patch24 -p1 -b .zlib-for-getimagesize %patch25 -p1 -- 2.44.0