Mon Jul 16 10:58:50 2018 UTC ()
php*: disable global regs on i386.
Fixes PR pkg/53222 that resurfaced
Remove the previous workaround to add GCC_REQD, which isn't sufficient
any more, possibly due to enabling ssp/fortify?
XXX bumping PKGREVISION might not be sufficient, for the same reason the
GCC_REQD had to be moved to Makefile.php, it affects modules too.
(maya)
diff -r1.10 -r1.11 pkgsrc/lang/php70/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/php70/Makefile.php
diff -r1.13 -r1.14 pkgsrc/lang/php71/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/php71/Makefile.php
diff -r1.8 -r1.9 pkgsrc/lang/php72/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/php72/Makefile.php
--- pkgsrc/lang/php70/Attic/Makefile 2017/10/27 08:46:49 1.10
+++ pkgsrc/lang/php70/Attic/Makefile 2018/07/16 10:58:50 1.11
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2017/10/27 08:46:49 taca Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/16 10:58:50 maya Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_VERSION}
CATEGORIES= lang
+PKGREVISION= 1
HOMEPAGE= http://www.php.net/
COMMENT= PHP Hypertext Preprocessor version 7.0
@@ -46,6 +47,12 @@
# https://bugs.php.net/bug.php?id=73880
.if ${MACHINE_ARCH} != "x86_64"
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
--- pkgsrc/lang/php70/Attic/Makefile.php 2017/08/04 23:07:28 1.7
+++ pkgsrc/lang/php70/Attic/Makefile.php 2018/07/16 10:58:50 1.8
@@ -1,12 +1,7 @@
-# $NetBSD: Makefile.php,v 1.7 2017/08/04 23:07:28 taca Exp $
+# $NetBSD: Makefile.php,v 1.8 2018/07/16 10:58:50 maya Exp $
# used by lang/php70/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
-
-# PHP bug #74526 - segfaults on build with GCC 4.8.5 i386
-.if ${MACHINE_ARCH} == "i386"
-GCC_REQD+= 4.9
-.endif
.include "../../lang/php70/Makefile.common"
--- pkgsrc/lang/php71/Attic/Makefile 2017/10/27 08:47:49 1.13
+++ pkgsrc/lang/php71/Attic/Makefile 2018/07/16 10:58:50 1.14
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2017/10/27 08:47:49 taca Exp $
+# $NetBSD: Makefile,v 1.14 2018/07/16 10:58:50 maya Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_VERSION:S/RC/rc/}
CATEGORIES= lang
+PKGREVISION= 1
HOMEPAGE= http://www.php.net/
COMMENT= PHP Hypertext Preprocessor version 7.1
@@ -46,6 +47,12 @@
# https://bugs.php.net/bug.php?id=73880
.if ${MACHINE_ARCH} != "x86_64"
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
--- pkgsrc/lang/php71/Attic/Makefile.php 2017/08/04 23:08:47 1.6
+++ pkgsrc/lang/php71/Attic/Makefile.php 2018/07/16 10:58:50 1.7
@@ -1,12 +1,7 @@
-# $NetBSD: Makefile.php,v 1.6 2017/08/04 23:08:47 taca Exp $
+# $NetBSD: Makefile.php,v 1.7 2018/07/16 10:58:50 maya Exp $
# used by lang/php71/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
-
-# PHP bug #74526 - segfaults on build with GCC 4.8.5 i386
-.if ${MACHINE_ARCH} == "i386"
-GCC_REQD+= 4.9
-.endif
.include "../../lang/php71/Makefile.common"
--- pkgsrc/lang/php72/Attic/Makefile 2018/04/26 15:44:15 1.8
+++ pkgsrc/lang/php72/Attic/Makefile 2018/07/16 10:58:50 1.9
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2018/04/26 15:44:15 taca Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/16 10:58:50 maya Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_VERSION:S/RC/rc/}
CATEGORIES= lang
+PKGREVISION= 1
HOMEPAGE= http://www.php.net/
COMMENT= PHP Hypertext Preprocessor version 7.2
@@ -40,6 +41,12 @@
SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
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"
--- pkgsrc/lang/php72/Attic/Makefile.php 2018/02/05 08:51:25 1.4
+++ pkgsrc/lang/php72/Attic/Makefile.php 2018/07/16 10:58:50 1.5
@@ -1,12 +1,7 @@
-# $NetBSD: Makefile.php,v 1.4 2018/02/05 08:51:25 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.5 2018/07/16 10:58:50 maya Exp $
# used by lang/php72/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
-
-# PHP bug #74526 - segfaults on build with GCC 4.8.5 i386
-.if ${MACHINE_ARCH} == "i386"
-GCC_REQD+= 4.9
-.endif
# the binary actually needs full dep on PCRE
BUILDLINK_DEPMETHOD.pcre= full