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
cvs diff -r1.4 -r1.4.6.1 pkgsrc/lang/php70/Attic/Makefile (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2016/06/24 15:27:57 taca Exp $ 1# $NetBSD: Makefile,v 1.4.6.1 2017/02/12 21:38:25 spz Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_VERSION} 6PKGNAME= php-${PHP_VERSION}
7CATEGORIES= lang 7CATEGORIES= lang
8 8
9HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 7.0 10COMMENT= PHP Hypertext Preprocessor version 7.0
11LICENSE= php 11LICENSE= php
12 12
13TEST_TARGET= test 13TEST_TARGET= test
14 14
@@ -31,26 +31,33 @@ CONF_FILES= ${EGDIR}/php.ini-production @@ -31,26 +31,33 @@ CONF_FILES= ${EGDIR}/php.ini-production
31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
32 32
33SUBST_CLASSES+= path 33SUBST_CLASSES+= path
34SUBST_MESSAGE.path= Fixing common paths. 34SUBST_MESSAGE.path= Fixing common paths.
35SUBST_STAGE.path= pre-configure 35SUBST_STAGE.path= pre-configure
36SUBST_FILES.path= ext/phar/phar/phar.php 36SUBST_FILES.path= ext/phar/phar/phar.php
37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php 37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
38SUBST_FILES.path+= sapi/cgi/Makefile.frag 38SUBST_FILES.path+= sapi/cgi/Makefile.frag
39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' 39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' 40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
41 41
42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php 42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
43 43
 44# segfault generating phar.phar for i386 & SPARC
 45# revisit this if builtin PCRE is updated beyond PCRE1 8.38
 46# https://bugs.php.net/bug.php?id=73880
 47.if ${MACHINE_ARCH} != "x86_64"
 48CONFIGURE_ARGS+= --without-pcre-jit
 49.endif
 50
44# Make sure modules can link correctly 51# Make sure modules can link correctly
45.if ${OPSYS} == "Darwin" 52.if ${OPSYS} == "Darwin"
46INSTALL_UNSTRIPPED= yes 53INSTALL_UNSTRIPPED= yes
47.endif 54.endif
48 55
49# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 56# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
50# and lacks the zone memory allocator 57# and lacks the zone memory allocator
51.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 58.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
52CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC 59CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
53.endif 60.endif
54 61
55post-extract: 62post-extract:
56 cd ${WRKSRC} && \ 63 cd ${WRKSRC} && \
cvs diff -r1.5 -r1.5.2.1 pkgsrc/lang/php71/Attic/Makefile (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2016/12/10 07:10:53 taca Exp $ 1# $NetBSD: Makefile,v 1.5.2.1 2017/02/12 21:38:25 spz Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_VERSION:S/RC/rc/} 6PKGNAME= php-${PHP_VERSION:S/RC/rc/}
7CATEGORIES= lang 7CATEGORIES= lang
8 8
9HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 7.1 10COMMENT= PHP Hypertext Preprocessor version 7.1
11LICENSE= php 11LICENSE= php
12 12
13TEST_TARGET= test 13TEST_TARGET= test
14 14
@@ -31,26 +31,33 @@ CONF_FILES= ${EGDIR}/php.ini-production @@ -31,26 +31,33 @@ CONF_FILES= ${EGDIR}/php.ini-production
31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
32 32
33SUBST_CLASSES+= path 33SUBST_CLASSES+= path
34SUBST_MESSAGE.path= Fixing common paths. 34SUBST_MESSAGE.path= Fixing common paths.
35SUBST_STAGE.path= pre-configure 35SUBST_STAGE.path= pre-configure
36SUBST_FILES.path= ext/phar/phar/phar.php 36SUBST_FILES.path= ext/phar/phar/phar.php
37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php 37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
38SUBST_FILES.path+= sapi/cgi/Makefile.frag 38SUBST_FILES.path+= sapi/cgi/Makefile.frag
39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' 39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' 40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
41 41
42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php 42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
43 43
 44# segfault generating phar.phar for i386 & SPARC
 45# revisit this if builtin PCRE is updated beyond PCRE1 8.38
 46# https://bugs.php.net/bug.php?id=73880
 47#.if ${MACHINE_ARCH} != "x86_64"
 48CONFIGURE_ARGS+= --without-pcre-jit
 49#.endif
 50
44# Make sure modules can link correctly 51# Make sure modules can link correctly
45.if ${OPSYS} == "Darwin" 52.if ${OPSYS} == "Darwin"
46INSTALL_UNSTRIPPED= yes 53INSTALL_UNSTRIPPED= yes
47.endif 54.endif
48 55
49# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 56# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
50# and lacks the zone memory allocator 57# and lacks the zone memory allocator
51.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 58.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
52CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC 59CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
53.endif 60.endif
54 61
55post-extract: 62post-extract:
56 cd ${WRKSRC} && \ 63 cd ${WRKSRC} && \