CVS commit: pkgsrc/lang

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Jul 31 01:17:56 UTC 2018

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

Log Message:
move --disable-gcc-global-regs to Makefile.php.
Seems to make a previously segfaulting netbsd-8/i386's build not segfault.
ap-php runs PHP's configure and builds some of its code, so it needs the
same flag.

Now we can stop requiring an arbitrary GCC version. The test case in the
GCC bugzilla fails on all GCC versions I tested, but magically some
versions of GCC manage to build a working PHP.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/php70/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/php70/Makefile.php
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/php71/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/php71/Makefile.php
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/php72/Makefile
cvs rdiff -u -r1.7 -r1.8 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
diff -u pkgsrc/lang/php70/Makefile:1.12 pkgsrc/lang/php70/Makefile:1.13
--- pkgsrc/lang/php70/Makefile:1.12     Fri Jul 20 13:27:28 2018
+++ pkgsrc/lang/php70/Makefile  Tue Jul 31 01:17:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/20 13:27:28 taca Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/31 01:17:56 maya Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -48,12 +48,6 @@ INSTALLATION_DIRS+=  ${CGIDIR} ${PHP_EXTE
 CONFIGURE_ARGS+=       --without-pcre-jit
 .endif
 
-.if ${MACHINE_ARCH} == "i386"
-# segfaults when buidling with many compilers
-# https://bugs.php.net/bug.php?id=74527
-CONFIGURE_ARGS+=       --disable-gcc-global-regs
-.endif
-
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=    yes

Index: pkgsrc/lang/php70/Makefile.php
diff -u pkgsrc/lang/php70/Makefile.php:1.10 pkgsrc/lang/php70/Makefile.php:1.11
--- pkgsrc/lang/php70/Makefile.php:1.10 Mon Jul 30 07:17:15 2018
+++ pkgsrc/lang/php70/Makefile.php      Tue Jul 31 01:17:56 2018
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.php,v 1.10 2018/07/30 07:17:15 manu Exp $
+# $NetBSD: Makefile.php,v 1.11 2018/07/31 01:17:56 maya 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
+# segfaults when buidling with many compilers
 # https://bugs.php.net/bug.php?id=74527
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
 .if ${MACHINE_ARCH} == "i386"
-GCC_REQD+=             6.4
+CONFIGURE_ARGS+=       --disable-gcc-global-regs
 .endif
 
 .include "../../lang/php70/Makefile.common"

Index: pkgsrc/lang/php71/Makefile
diff -u pkgsrc/lang/php71/Makefile:1.15 pkgsrc/lang/php71/Makefile:1.16
--- pkgsrc/lang/php71/Makefile:1.15     Fri Jul 20 13:23:46 2018
+++ pkgsrc/lang/php71/Makefile  Tue Jul 31 01:17:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/07/20 13:23:46 taca Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/31 01:17:56 maya Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -48,12 +48,6 @@ INSTALLATION_DIRS+=  ${CGIDIR} ${PHP_EXTE
 CONFIGURE_ARGS+=       --without-pcre-jit
 .endif
 
-# segfaults when buidling with many compilers
-# https://bugs.php.net/bug.php?id=74527
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=       --disable-gcc-global-regs
-.endif
-
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=    yes

Index: pkgsrc/lang/php71/Makefile.php
diff -u pkgsrc/lang/php71/Makefile.php:1.9 pkgsrc/lang/php71/Makefile.php:1.10
--- pkgsrc/lang/php71/Makefile.php:1.9  Mon Jul 30 07:17:16 2018
+++ pkgsrc/lang/php71/Makefile.php      Tue Jul 31 01:17:56 2018
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.php,v 1.9 2018/07/30 07:17:16 manu Exp $
+# $NetBSD: Makefile.php,v 1.10 2018/07/31 01:17:56 maya 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
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
 .if ${MACHINE_ARCH} == "i386"
-GCC_REQD+=             6.4
+CONFIGURE_ARGS+=       --disable-gcc-global-regs
 .endif
 
 .include "../../lang/php71/Makefile.common"

Index: pkgsrc/lang/php72/Makefile
diff -u pkgsrc/lang/php72/Makefile:1.12 pkgsrc/lang/php72/Makefile:1.13
--- pkgsrc/lang/php72/Makefile:1.12     Fri Jul 20 13:29:50 2018
+++ pkgsrc/lang/php72/Makefile  Tue Jul 31 01:17:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/20 13:29:50 taca Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/31 01:17:56 maya Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -40,12 +40,6 @@ SUBST_SED.path+=     -e 's,@PREFIX@,${PREFIX
 
 INSTALLATION_DIRS+=    ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
-# segfaults when buidling with many compilers
-# https://bugs.php.net/bug.php?id=74527
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=       --disable-gcc-global-regs
-.endif
-
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=    yes

Index: pkgsrc/lang/php72/Makefile.php
diff -u pkgsrc/lang/php72/Makefile.php:1.7 pkgsrc/lang/php72/Makefile.php:1.8
--- pkgsrc/lang/php72/Makefile.php:1.7  Mon Jul 30 07:17:16 2018
+++ pkgsrc/lang/php72/Makefile.php      Tue Jul 31 01:17:56 2018
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.php,v 1.7 2018/07/30 07:17:16 manu Exp $
+# $NetBSD: Makefile.php,v 1.8 2018/07/31 01:17:56 maya 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 
+# segfaults when buidling with many compilers
 # https://bugs.php.net/bug.php?id=74527
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
 .if ${MACHINE_ARCH} == "i386"
-GCC_REQD+=             6.4
+CONFIGURE_ARGS+=       --disable-gcc-global-regs
 .endif
 
 # the binary actually needs full dep on PCRE