diff options
| author | maya <maya@pkgsrc.org> | 2018-07-16 10:58:50 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2018-07-16 10:58:50 +0000 |
| commit | 981d0f93963640b83e4e1138d9ad8643f28d6008 (patch) | |
| tree | 985c0e156d164eba71f8a09a50faa81e71a22ee0 /lang/php72 | |
| parent | 8e1a8e57b3996c4a0a39e46f36c15ae061448367 (diff) | |
| download | pkgsrc-981d0f93963640b83e4e1138d9ad8643f28d6008.tar.gz | |
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.
Diffstat (limited to 'lang/php72')
| -rw-r--r-- | lang/php72/Makefile | 9 | ||||
| -rw-r--r-- | lang/php72/Makefile.php | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lang/php72/Makefile b/lang/php72/Makefile index e8a30063f95..3b076a30aa8 100644 --- a/lang/php72/Makefile +++ b/lang/php72/Makefile @@ -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 @@ -41,6 +42,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" INSTALL_UNSTRIPPED= yes diff --git a/lang/php72/Makefile.php b/lang/php72/Makefile.php index 94efbcc28a8..f02c4c8bb9d 100644 --- a/lang/php72/Makefile.php +++ b/lang/php72/Makefile.php @@ -1,13 +1,8 @@ -# $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 |