CVS commit: pkgsrc/lang/php70

["Maya Rashish" <maya%netbsd.org@localhost>]

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

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.4 pkgsrc/lang/php70/Makefile:1.5
--- pkgsrc/lang/php70/Makefile:1.4      Fri Jun 24 15:27:57 2016
+++ pkgsrc/lang/php70/Makefile  Sun Jan 22 11:37:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/24 15:27:57 taca Exp $
+# $NetBSD: Makefile,v 1.5 2017/01/22 11:37:29 maya Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -41,6 +41,13 @@ SUBST_SED.path+=     -e 's,@PREFIX@,${PREFIX
 
 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