Sun Feb 12 21:38:25 2017 UTC ()
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
(spz)
diff -r1.4 -r1.4.6.1 pkgsrc/lang/php70/Makefile
diff -r1.5 -r1.5.2.1 pkgsrc/lang/php71/Makefile
--- pkgsrc/lang/php70/Attic/Makefile 2016/06/24 15:27:57 1.4
+++ pkgsrc/lang/php70/Attic/Makefile 2017/02/12 21:38:25 1.4.6.1
@@ -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.
@@ -40,6 +40,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"
--- pkgsrc/lang/php71/Attic/Makefile 2016/12/10 07:10:53 1.5
+++ pkgsrc/lang/php71/Attic/Makefile 2017/02/12 21:38:25 1.5.2.1
@@ -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.
@@ -40,6 +40,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"