CVS commit: pkgsrc/lang

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Mon Jul 30 07:17:16 UTC 2018

Modified Files:
        pkgsrc/lang/php70: Makefile.php
        pkgsrc/lang/php71: Makefile.php
        pkgsrc/lang/php72: Makefile.php

Log Message:
Fix PHP buidl on i386

The --disable-gcc-global-regs fix is not enough, we really need
GCC 6 to avoid php crashing during www/ap-ph build.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/php70/Makefile.php
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/php71/Makefile.php
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/php72/Makefile.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php70/Makefile.php
diff -u pkgsrc/lang/php70/Makefile.php:1.9 pkgsrc/lang/php70/Makefile.php:1.10
--- pkgsrc/lang/php70/Makefile.php:1.9  Wed Jul 18 07:33:12 2018
+++ pkgsrc/lang/php70/Makefile.php      Mon Jul 30 07:17:15 2018
@@ -1,8 +1,14 @@
-# $NetBSD: Makefile.php,v 1.9 2018/07/18 07:33:12 manu Exp $
+# $NetBSD: Makefile.php,v 1.10 2018/07/30 07:17:15 manu Exp $
 # used by lang/php70/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
+# With --disable-gcc-global-regs, works around
+# https://bugs.php.net/bug.php?id=74527
+.if ${MACHINE_ARCH} == "i386"
+GCC_REQD+=             6.4
+.endif
+
 .include "../../lang/php70/Makefile.common"
 
 DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo

Index: pkgsrc/lang/php71/Makefile.php
diff -u pkgsrc/lang/php71/Makefile.php:1.8 pkgsrc/lang/php71/Makefile.php:1.9
--- pkgsrc/lang/php71/Makefile.php:1.8  Wed Jul 18 07:33:12 2018
+++ pkgsrc/lang/php71/Makefile.php      Mon Jul 30 07:17:16 2018
@@ -1,8 +1,14 @@
-# $NetBSD: Makefile.php,v 1.8 2018/07/18 07:33:12 manu Exp $
+# $NetBSD: Makefile.php,v 1.9 2018/07/30 07:17:16 manu Exp $
 # used by lang/php71/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
+# With --disable-gcc-global-regs, works around 
+# https://bugs.php.net/bug.php?id=74527
+.if ${MACHINE_ARCH} == "i386"
+GCC_REQD+=             6.4
+.endif
+
 .include "../../lang/php71/Makefile.common"
 
 DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo

Index: pkgsrc/lang/php72/Makefile.php
diff -u pkgsrc/lang/php72/Makefile.php:1.6 pkgsrc/lang/php72/Makefile.php:1.7
--- pkgsrc/lang/php72/Makefile.php:1.6  Wed Jul 18 07:33:12 2018
+++ pkgsrc/lang/php72/Makefile.php      Mon Jul 30 07:17:16 2018
@@ -1,8 +1,14 @@
-# $NetBSD: Makefile.php,v 1.6 2018/07/18 07:33:12 manu Exp $
+# $NetBSD: Makefile.php,v 1.7 2018/07/30 07:17:16 manu Exp $
 # used by lang/php72/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
+# With --disable-gcc-global-regs, works around 
+# https://bugs.php.net/bug.php?id=74527
+.if ${MACHINE_ARCH} == "i386"
+GCC_REQD+=             6.4
+.endif
+
 # the binary actually needs full dep on PCRE
 BUILDLINK_DEPMETHOD.pcre=      full