CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Maya Rashish" <maya%netbsd.org@localhost>
Date: Mon, 16 Jul 2018 10:58:50 +0000

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Jul 16 10:58:50 UTC 2018

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/php70/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/php70/Makefile.php
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/php71/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/php71/Makefile.php
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/php72/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php72/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.10 pkgsrc/lang/php70/Makefile:1.11
--- pkgsrc/lang/php70/Makefile:1.10     Fri Oct 27 08:46:49 2017
+++ pkgsrc/lang/php70/Makefile  Mon Jul 16 10:58:50 2018
@@ -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_EXTE
 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

Index: pkgsrc/lang/php70/Makefile.php
diff -u pkgsrc/lang/php70/Makefile.php:1.7 pkgsrc/lang/php70/Makefile.php:1.8
--- pkgsrc/lang/php70/Makefile.php:1.7  Fri Aug  4 23:07:28 2017
+++ pkgsrc/lang/php70/Makefile.php      Mon Jul 16 10:58:50 2018
@@ -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

Index: pkgsrc/lang/php71/Makefile
diff -u pkgsrc/lang/php71/Makefile:1.13 pkgsrc/lang/php71/Makefile:1.14
--- pkgsrc/lang/php71/Makefile:1.13     Fri Oct 27 08:47:49 2017
+++ pkgsrc/lang/php71/Makefile  Mon Jul 16 10:58:50 2018
@@ -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_EXTE
 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

Index: pkgsrc/lang/php71/Makefile.php
diff -u pkgsrc/lang/php71/Makefile.php:1.6 pkgsrc/lang/php71/Makefile.php:1.7
--- pkgsrc/lang/php71/Makefile.php:1.6  Fri Aug  4 23:08:47 2017
+++ pkgsrc/lang/php71/Makefile.php      Mon Jul 16 10:58:50 2018
@@ -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

Index: pkgsrc/lang/php72/Makefile
diff -u pkgsrc/lang/php72/Makefile:1.8 pkgsrc/lang/php72/Makefile:1.9
--- pkgsrc/lang/php72/Makefile:1.8      Thu Apr 26 15:44:15 2018
+++ pkgsrc/lang/php72/Makefile  Mon Jul 16 10:58:50 2018
@@ -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
 
 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

Index: pkgsrc/lang/php72/Makefile.php
diff -u pkgsrc/lang/php72/Makefile.php:1.4 pkgsrc/lang/php72/Makefile.php:1.5
--- pkgsrc/lang/php72/Makefile.php:1.4  Mon Feb  5 08:51:25 2018
+++ pkgsrc/lang/php72/Makefile.php      Mon Jul 16 10:58:50 2018
@@ -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

Prev by Date: CVS commit: pkgsrc/security/mit-krb5
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/security/mit-krb5
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index