diff options
| author | manu <manu> | 2017-06-20 07:24:08 +0000 |
|---|---|---|
| committer | manu <manu> | 2017-06-20 07:24:08 +0000 |
| commit | 1f13f8fff2a494b2e704f52982082e62f69fb0ba (patch) | |
| tree | 0d284a1f24426e9dd63eae1959711c2dbd44d750 /lang | |
| parent | d333aedeb5232acb92e43d65e7101e78cd373474 (diff) | |
| download | pkgsrc-1f13f8fff2a494b2e704f52982082e62f69fb0ba.tar.gz | |
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 (limited to 'lang')
| -rw-r--r-- | lang/php70/Makefile | 7 | ||||
| -rw-r--r-- | lang/php70/Makefile.php | 7 | ||||
| -rw-r--r-- | lang/php71/Makefile | 8 | ||||
| -rw-r--r-- | lang/php71/Makefile.php | 7 |
4 files changed, 14 insertions, 15 deletions
diff --git a/lang/php70/Makefile b/lang/php70/Makefile index 370f8f26814..13ca35a1288 100644 --- a/lang/php70/Makefile +++ b/lang/php70/Makefile @@ -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 diff --git a/lang/php70/Makefile.php b/lang/php70/Makefile.php index 5c444e3e765..3234bb5fa62 100644 --- a/lang/php70/Makefile.php +++ b/lang/php70/Makefile.php @@ -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 --git a/lang/php71/Makefile b/lang/php71/Makefile index 530055ed1d7..3da0d2ec149 100644 --- a/lang/php71/Makefile +++ b/lang/php71/Makefile @@ -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 diff --git a/lang/php71/Makefile.php b/lang/php71/Makefile.php index bfb1826a68d..fd7cbf3dd88 100644 --- a/lang/php71/Makefile.php +++ b/lang/php71/Makefile.php @@ -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 |