summaryrefslogtreecommitdiff
path: root/lang/php71
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2017-03-23 09:33:02 +0000
committerjperkin <jperkin@pkgsrc.org>2017-03-23 09:33:02 +0000
commit893c52bd0b5aed6da071127eabd848a98e36fdb1 (patch)
treee086b23474841fdf8be30bba585f6bceb38b755b /lang/php71
parent07698af86b8258257b70c01b4fef03b5a65f9a57 (diff)
downloadpkgsrc-893c52bd0b5aed6da071127eabd848a98e36fdb1.tar.gz
Fix the macro tests for fpclassify(3) functions. Fixes PR#52104.
Diffstat (limited to 'lang/php71')
-rw-r--r--lang/php71/distinfo3
-rw-r--r--lang/php71/patches/patch-main_php__config.h.in33
2 files changed, 35 insertions, 1 deletions
diff --git a/lang/php71/distinfo b/lang/php71/distinfo
index 50454979541..0896bf89294 100644
--- a/lang/php71/distinfo
+++ b/lang/php71/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2017/03/17 15:35:14 taca Exp $
+$NetBSD: distinfo,v 1.16 2017/03/23 09:33:02 jperkin Exp $
SHA1 (php-7.1.3.tar.bz2) = 60359b3154d00502f84adfea84d008e3aa0b81ab
RMD160 (php-7.1.3.tar.bz2) = a54b805e234a8bf7f1f6a1c0b2250e11bcaf1219
@@ -17,6 +17,7 @@ SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
+SHA1 (patch-main_php__config.h.in) = a954c2963bdc9cbb280a9852e18ac8fb8fc834c2
SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
diff --git a/lang/php71/patches/patch-main_php__config.h.in b/lang/php71/patches/patch-main_php__config.h.in
new file mode 100644
index 00000000000..7e058e59bef
--- /dev/null
+++ b/lang/php71/patches/patch-main_php__config.h.in
@@ -0,0 +1,33 @@
+$NetBSD: patch-main_php__config.h.in,v 1.1 2017/03/23 09:33:02 jperkin Exp $
+
+Fix tests for defines which are 0/1 not defined/undefined.
+
+--- main/php_config.h.in.orig 2017-03-14 13:17:50.000000000 +0000
++++ main/php_config.h.in
+@@ -2515,7 +2515,7 @@ int zend_sprintf(char *buffer, const cha
+ #endif
+
+ #ifndef zend_isnan
+-#ifdef HAVE_DECL_ISNAN
++#if HAVE_DECL_ISNAN == 1
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -2524,7 +2524,7 @@ int zend_sprintf(char *buffer, const cha
+ #endif
+ #endif
+
+-#ifdef HAVE_DECL_ISINF
++#if HAVE_DECL_ISINF == 1
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -2535,7 +2535,7 @@ int zend_sprintf(char *buffer, const cha
+ #define zend_isinf(a) 0
+ #endif
+
+-#if defined(HAVE_DECL_ISFINITE)
++#if HAVE_DECL_ISFINITE == 1
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)