com php-src: Fixed bug #69993: NEWS ext/gmp/config.m4
| From: | Nikita Popov | Date: | Sat, 14 Jan 2017 13:13:15 +0000 |
| Subject: | com php-src: Fixed bug #69993: NEWS ext/gmp/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96729@lists.php.net to get a copy of this message | ||
Commit: 60aff0bd30197a4fd898904a45f1677e333a6dda
Author: Yordan Gigov <jgigov@abv.bg> Fri, 12 Aug 2016 17:52:18 +0300
Committer: Nikita Popov <nikita.ppv@gmail.com> Sat, 14 Jan 2017 14:13:15 +0100
Parents: fbf655afbd1cc5b5a9c9e03405c62ae714425435
Branches: PHP-7.0 PHP-7..1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60aff0bd30197a4fd898904a45f1677e333a6dda
Log:
Fixed bug #69993
Bugs:
https://bugs.php.net/69993
Changed paths:
M NEWS
M ext/gmp/config.m4
Diff:
diff --git a/NEWS b/NEWS
index 2778842..ce4a748 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,10 @@ PHP NEWS
. Fixed bug #67583 (double fastcgi_end_request on max_children limit)..
(Dmitry Saprykin)
+- GMP:
+ . Fixed bug #69993 (test for gmp.h needs to test machine includes).
+ (Jordan Gigov)
+
- Mysqlnd:
. Fixed bug #69899 (segfault on close() after free_result() with mysqlnd).
(Richard Fussenegger)
diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
index 8265fb8..22cca7e 100644
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@@ -3,8 +3,11 @@ PHP_ARG_WITH(gmp, for GNU MP support,
if test "$PHP_GMP" != "no"; then
+ MACHINE_INCLUDES=$($CC -dumpmachine)
+
for i in $PHP_GMP /usr/local /usr; do
test -f $i/include/gmp.h && GMP_DIR=$i && break
+ test -f $i/include/$MACHINE_INCLUDES/gmp.h && GMP_DIR=$i && break
done
if test -z "$GMP_DIR"; then