kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

php*: disable global regs on i386.

Browse source 
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.
This commit is contained in:
maya 2018-07-16 10:58:50 +00:00
parent 589484bd12
commit 11bf42218d
6 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lang/php70/Makefile
View file

@ -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
@ -48,6 +49,12 @@ INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
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
.if ${OPSYS} == "Darwin"
INSTALL_UNSTRIPPED= yes

7
lang/php70/Makefile.php
View file

@ -1,13 +1,8 @@
# $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"
DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo

9
lang/php71/Makefile
View file

@ -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
@ -48,6 +49,12 @@ INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
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
.if ${OPSYS} == "Darwin"
INSTALL_UNSTRIPPED= yes

7
lang/php71/Makefile.php
View file

@ -1,13 +1,8 @@
# $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"
DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo

9
lang/php72/Makefile
View file

@ -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

7
lang/php72/Makefile.php
View file

@ -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