From 884459bdb19466471c6844dab3a96f7059bca02a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 20 Sep 2019 14:04:27 +0200
Subject: fix broken gmp extension https://bugs.php.net/78574

---
 php-upstream.patch | 26 ++++++++++++++++++++++++++
 php.spec           |  7 ++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 php-upstream.patch

diff --git a/php-upstream.patch b/php-upstream.patch
new file mode 100644
index 0000000..f75d8d9
--- /dev/null
+++ b/php-upstream.patch
@@ -0,0 +1,26 @@
+From dc40332bb2276553ea10bca574f03a8dc9bea53d Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Fri, 20 Sep 2019 13:30:13 +0200
+Subject: [PATCH] Fixed bug #78574 (broken shared build)
+
+---
+ NEWS              | 3 +++
+ ext/gmp/config.m4 | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
+index aa4936b3c3..fa55751cf1 100644
+--- a/ext/gmp/config.m4
++++ b/ext/gmp/config.m4
+@@ -10,7 +10,7 @@ if test "$PHP_GMP" != "no"; then
+       AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.])
+     ])
+ 
+-    PHP_ADD_LIBRARY(gmp, GMP_SHARED_LIBADD)
++    PHP_ADD_LIBRARY(gmp,,GMP_SHARED_LIBADD)
+   else
+     if test ! -f $PHP_GMP/include/gmp.h; then
+       AC_MSG_ERROR(Unable to locate gmp.h)
+-- 
+2.11.0
+
diff --git a/php.spec b/php.spec
index 25bc52f..e5605d6 100644
--- a/php.spec
+++ b/php.spec
@@ -108,7 +108,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 21%{?dist}
+Release: 22%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -174,6 +174,7 @@ Patch91: php-7.2.0-oci8conf.patch
 Patch300: php-7.0.10-datetests.patch
 
 # WIP
+Patch400: php-upstream.patch
 
 BuildRequires: gnupg2
 BuildRequires: bzip2-devel
@@ -945,6 +946,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch300 -p1 -b .datetests
 
 # WIP patch
+%patch400 -p1
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1788,6 +1790,9 @@ fi
 
 
 %changelog
+* Fri Sep 20 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc2-22
+- fix broken gmp extension https://bugs.php.net/78574
+
 * Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc2-21
 - update to 7.4.0RC2 (new tag)
 
-- 
cgit