[pkgsrc/trunk]: pkgsrc/lang Fix crash on i386 in www/ap-php build with PHP 7.x

[manu <manu%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5df58d0ada41
branches:  trunk
changeset: 364003:5df58d0ada41
user:      manu <manu%pkgsrc.org@localhost>
date:      Tue Jun 20 07:24:08 2017 +0000

description:
Fix crash on i386 in www/ap-php build with PHP 7.x

PHP 7.x on i386 crashes unless built with GCC >= 4.9. There
was the necessary tweak for the lang/php70 and lang/php71
packages, but not for dependencies such www/ap-php. As a
result, www/ap-php crashed during the build. We fix this by
moving the GCC_REQD to Makefile.php which is included
by dependent packages

diffstat:

 lang/php70/Makefile     |  7 +------
 lang/php70/Makefile.php |  7 ++++++-
 lang/php71/Makefile     |  8 +-------
 lang/php71/Makefile.php |  7 ++++++-
 4 files changed, 14 insertions(+), 15 deletions(-)

diffs (79 lines):

diff -r c8e16c96114c -r 5df58d0ada41 lang/php70/Makefile
--- a/lang/php70/Makefile       Tue Jun 20 00:35:38 2017 +0000
+++ b/lang/php70/Makefile       Tue Jun 20 07:24:08 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/05/03 11:41:36 maya Exp $
+# $NetBSD: Makefile,v 1.9 2017/06/20 07:24:08 manu Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -18,11 +18,6 @@
 
 PHP_VERSIONS_ACCEPTED=         70
 
-# PHP bug #74526 - segfaults on build with GCC 4.8.5 i386
-.if ${MACHINE_ARCH} == "i386"
-GCC_REQD+=             4.9
-.endif
-
 .include "Makefile.php"
 
 CGIDIR=                        ${PREFIX}/libexec/cgi-bin
diff -r c8e16c96114c -r 5df58d0ada41 lang/php70/Makefile.php
--- a/lang/php70/Makefile.php   Tue Jun 20 00:35:38 2017 +0000
+++ b/lang/php70/Makefile.php   Tue Jun 20 07:24:08 2017 +0000
@@ -1,8 +1,13 @@
-# $NetBSD: Makefile.php,v 1.3 2017/04/05 12:28:59 fhajny Exp $
+# $NetBSD: Makefile.php,v 1.4 2017/06/20 07:24:08 manu 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"
 
 DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo
diff -r c8e16c96114c -r 5df58d0ada41 lang/php71/Makefile
--- a/lang/php71/Makefile       Tue Jun 20 00:35:38 2017 +0000
+++ b/lang/php71/Makefile       Tue Jun 20 07:24:08 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/05/03 11:48:15 maya Exp $
+# $NetBSD: Makefile,v 1.12 2017/06/20 07:24:08 manu Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -18,12 +18,6 @@
 
 PHP_VERSIONS_ACCEPTED=         71
 
-# PHP bug #74526 - segfaults on build with GCC 4.8.5 i386
-.if ${MACHINE_ARCH} == "i386"
-GCC_REQD+=             4.9
-.endif
-
-
 .include "Makefile.php"
 
 CGIDIR=                        ${PREFIX}/libexec/cgi-bin
diff -r c8e16c96114c -r 5df58d0ada41 lang/php71/Makefile.php
--- a/lang/php71/Makefile.php   Tue Jun 20 00:35:38 2017 +0000
+++ b/lang/php71/Makefile.php   Tue Jun 20 07:24:08 2017 +0000
@@ -1,8 +1,13 @@
-# $NetBSD: Makefile.php,v 1.2 2017/04/05 12:28:59 fhajny Exp $
+# $NetBSD: Makefile.php,v 1.3 2017/06/20 07:24:08 manu 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"
 
 DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo