From 5f48d13a26bdc4539d41098f174ce7748c1497fb Mon Sep 17 00:00:00 2001 From: spz Date: Sun, 12 Feb 2017 21:38:25 +0000 Subject: Pullup ticket #5203 - requested by maya lang/php70: build fix lang/php71: build fix Revisions pulled up: - lang/php70/Makefile 1.5 - lang/php71/Makefile 1.6 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: maya Date: Sun Jan 22 11:37:29 UTC 2017 Modified Files: pkgsrc/lang/php70: Makefile Log Message: php70: add workaround requested in PR pkg/51787, pcre-jit segfaults on non-amd64 (i386, SPARC - at least). disable it until PHP, add note that it's mostly relevant for PCRE1 8.38, so if PHP updates to PCRE2 as they plan, it will be irrelevant. >From Joern Clausen / cmb@php To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php70/Makefile ------------------------------------------------------------------- Module Name: pkgsrc Committed By: maya Date: Sun Jan 22 11:42:22 UTC 2017 Modified Files: pkgsrc/lang/php71: Makefile Log Message: php71: add workaround requested in PR pkg/51787, pcre-jit segfaults on non-amd64 (i386, SPARC - at least). disable it until PHP, add note that it's mostly relevant for PCRE1 8.38, so if PHP updates to PCRE2 as they plan, it will be irrelevant. >From Joern Clausen / cmb@php To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/php71/Makefile --- lang/php70/Makefile | 9 ++++++++- lang/php71/Makefile | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lang/php70/Makefile b/lang/php70/Makefile index 82a634fbe8a..394d2c86d08 100644 --- a/lang/php70/Makefile +++ b/lang/php70/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/06/24 15:27:57 taca Exp $ +# $NetBSD: Makefile,v 1.4.6.1 2017/02/12 21:38:25 spz Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -41,6 +41,13 @@ SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php +# segfault generating phar.phar for i386 & SPARC +# revisit this if builtin PCRE is updated beyond PCRE1 8.38 +# https://bugs.php.net/bug.php?id=73880 +.if ${MACHINE_ARCH} != "x86_64" +CONFIGURE_ARGS+= --without-pcre-jit +.endif + # Make sure modules can link correctly .if ${OPSYS} == "Darwin" INSTALL_UNSTRIPPED= yes diff --git a/lang/php71/Makefile b/lang/php71/Makefile index 45db3c7a2fe..1b60385f5de 100644 --- a/lang/php71/Makefile +++ b/lang/php71/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/12/10 07:10:53 taca Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2017/02/12 21:38:25 spz Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -41,6 +41,13 @@ SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php +# segfault generating phar.phar for i386 & SPARC +# revisit this if builtin PCRE is updated beyond PCRE1 8.38 +# https://bugs.php.net/bug.php?id=73880 +#.if ${MACHINE_ARCH} != "x86_64" +CONFIGURE_ARGS+= --without-pcre-jit +#.endif + # Make sure modules can link correctly .if ${OPSYS} == "Darwin" INSTALL_UNSTRIPPED= yes -- cgit v1.2.3