pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang move --disable-gcc-global-regs to Makefile.php.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/44cdabd20020
branches:  trunk
changeset: 383418:44cdabd20020
user:      maya <maya%pkgsrc.org@localhost>
date:      Tue Jul 31 01:17:56 2018 +0000

description:
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.

diffstat:

 lang/php70/Makefile     |  8 +-------
 lang/php70/Makefile.php |  7 ++++---
 lang/php71/Makefile     |  8 +-------
 lang/php71/Makefile.php |  5 +++--
 lang/php72/Makefile     |  8 +-------
 lang/php72/Makefile.php |  7 ++++---
 6 files changed, 14 insertions(+), 29 deletions(-)

diffs (125 lines):

diff -r 32771ea77d35 -r 44cdabd20020 lang/php70/Makefile
--- a/lang/php70/Makefile       Mon Jul 30 19:53:32 2018 +0000
+++ b/lang/php70/Makefile       Tue Jul 31 01:17:56 2018 +0000
@@ -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 @@
 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
diff -r 32771ea77d35 -r 44cdabd20020 lang/php70/Makefile.php
--- a/lang/php70/Makefile.php   Mon Jul 30 19:53:32 2018 +0000
+++ b/lang/php70/Makefile.php   Tue Jul 31 01:17:56 2018 +0000
@@ -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"
diff -r 32771ea77d35 -r 44cdabd20020 lang/php71/Makefile
--- a/lang/php71/Makefile       Mon Jul 30 19:53:32 2018 +0000
+++ b/lang/php71/Makefile       Tue Jul 31 01:17:56 2018 +0000
@@ -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 @@
 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
diff -r 32771ea77d35 -r 44cdabd20020 lang/php71/Makefile.php
--- a/lang/php71/Makefile.php   Mon Jul 30 19:53:32 2018 +0000
+++ b/lang/php71/Makefile.php   Tue Jul 31 01:17:56 2018 +0000
@@ -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"
diff -r 32771ea77d35 -r 44cdabd20020 lang/php72/Makefile
--- a/lang/php72/Makefile       Mon Jul 30 19:53:32 2018 +0000
+++ b/lang/php72/Makefile       Tue Jul 31 01:17:56 2018 +0000
@@ -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 @@
 
 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
diff -r 32771ea77d35 -r 44cdabd20020 lang/php72/Makefile.php
--- a/lang/php72/Makefile.php   Mon Jul 30 19:53:32 2018 +0000
+++ b/lang/php72/Makefile.php   Tue Jul 31 01:17:56 2018 +0000
@@ -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



Home | Main Index | Thread Index | Old Index