CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   manu
Date:           Tue Jun 20 07:24:08 UTC 2017

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

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/php70/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php70/Makefile.php
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/php71/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php71/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.8 pkgsrc/lang/php70/Makefile:1.9
--- pkgsrc/lang/php70/Makefile:1.8      Wed May  3 11:41:36 2017
+++ pkgsrc/lang/php70/Makefile  Tue Jun 20 07:24:08 2017
@@ -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_CHECK_INSTALLED= No
 
 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

Index: pkgsrc/lang/php70/Makefile.php
diff -u pkgsrc/lang/php70/Makefile.php:1.3 pkgsrc/lang/php70/Makefile.php:1.4
--- pkgsrc/lang/php70/Makefile.php:1.3  Wed Apr  5 12:28:59 2017
+++ pkgsrc/lang/php70/Makefile.php      Tue Jun 20 07:24:08 2017
@@ -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

Index: pkgsrc/lang/php71/Makefile
diff -u pkgsrc/lang/php71/Makefile:1.11 pkgsrc/lang/php71/Makefile:1.12
--- pkgsrc/lang/php71/Makefile:1.11     Wed May  3 11:48:15 2017
+++ pkgsrc/lang/php71/Makefile  Tue Jun 20 07:24:08 2017
@@ -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_CHECK_INSTALLED= No
 
 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

Index: pkgsrc/lang/php71/Makefile.php
diff -u pkgsrc/lang/php71/Makefile.php:1.2 pkgsrc/lang/php71/Makefile.php:1.3
--- pkgsrc/lang/php71/Makefile.php:1.2  Wed Apr  5 12:28:59 2017
+++ pkgsrc/lang/php71/Makefile.php      Tue Jun 20 07:24:08 2017
@@ -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