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/Makefilediff -r1.4 -r1.4.6.1 pkgsrc/lang/php70/Makefile
(spz)
@@ -1,68 +1,75 @@ | @@ -1,68 +1,75 @@ | |||
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 | # | |
6 | PKGNAME= php-${PHP_VERSION} | 6 | PKGNAME= php-${PHP_VERSION} | |
7 | CATEGORIES= lang | 7 | CATEGORIES= lang | |
8 | 8 | |||
9 | HOMEPAGE= http://www.php.net/ | 9 | HOMEPAGE= http://www.php.net/ | |
10 | COMMENT= PHP Hypertext Preprocessor version 7.0 | 10 | COMMENT= PHP Hypertext Preprocessor version 7.0 | |
11 | LICENSE= php | 11 | LICENSE= php | |
12 | 12 | |||
13 | TEST_TARGET= test | 13 | TEST_TARGET= test | |
14 | 14 | |||
15 | USE_TOOLS+= gmake lex pkg-config | 15 | USE_TOOLS+= gmake lex pkg-config | |
16 | LIBTOOL_OVERRIDE= # empty | 16 | LIBTOOL_OVERRIDE= # empty | |
17 | PHP_CHECK_INSTALLED= No | 17 | PHP_CHECK_INSTALLED= No | |
18 | 18 | |||
19 | PHP_VERSIONS_ACCEPTED= 70 | 19 | PHP_VERSIONS_ACCEPTED= 70 | |
20 | 20 | |||
21 | .include "Makefile.php" | 21 | .include "Makefile.php" | |
22 | 22 | |||
23 | CGIDIR= ${PREFIX}/libexec/cgi-bin | 23 | CGIDIR= ${PREFIX}/libexec/cgi-bin | |
24 | EGDIR= ${PREFIX}/share/examples/php | 24 | EGDIR= ${PREFIX}/share/examples/php | |
25 | MESSAGE_SUBST+= CGIDIR=${CGIDIR} | 25 | MESSAGE_SUBST+= CGIDIR=${CGIDIR} | |
26 | 26 | |||
27 | CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} | 27 | CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} | |
28 | MAKE_ENV+= INSTALL_ROOT=${DESTDIR} | 28 | MAKE_ENV+= INSTALL_ROOT=${DESTDIR} | |
29 | 29 | |||
30 | CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini | 30 | CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini | |
31 | PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" | 31 | PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" | |
32 | 32 | |||
33 | SUBST_CLASSES+= path | 33 | SUBST_CLASSES+= path | |
34 | SUBST_MESSAGE.path= Fixing common paths. | 34 | SUBST_MESSAGE.path= Fixing common paths. | |
35 | SUBST_STAGE.path= pre-configure | 35 | SUBST_STAGE.path= pre-configure | |
36 | SUBST_FILES.path= ext/phar/phar/phar.php | 36 | SUBST_FILES.path= ext/phar/phar/phar.php | |
37 | SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php | 37 | SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php | |
38 | SUBST_FILES.path+= sapi/cgi/Makefile.frag | 38 | SUBST_FILES.path+= sapi/cgi/Makefile.frag | |
39 | SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' | 39 | SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' | |
40 | SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' | 40 | SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' | |
41 | 41 | |||
42 | INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php | 42 | INSTALLATION_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" | |||
48 | CONFIGURE_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" | |
46 | INSTALL_UNSTRIPPED= yes | 53 | INSTALL_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].*-*) | |
52 | CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC | 59 | CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC | |
53 | .endif | 60 | .endif | |
54 | 61 | |||
55 | post-extract: | 62 | post-extract: | |
56 | cd ${WRKSRC} && \ | 63 | cd ${WRKSRC} && \ | |
57 | ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \; | 64 | ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \; | |
58 | 65 | |||
59 | post-install: | 66 | post-install: | |
60 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php | 67 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php | |
61 | ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ | 68 | ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ | |
62 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 | 69 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 | |
63 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php | 70 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php | |
64 | cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ | 71 | cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ | |
65 | ${DESTDIR}${EGDIR} | 72 | ${DESTDIR}${EGDIR} | |
66 | ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php | 73 | ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php | |
67 | 74 | |||
68 | .include "../../mk/bsd.pkg.mk" | 75 | .include "../../mk/bsd.pkg.mk" |
@@ -1,68 +1,75 @@ | @@ -1,68 +1,75 @@ | |||
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 | # | |
6 | PKGNAME= php-${PHP_VERSION:S/RC/rc/} | 6 | PKGNAME= php-${PHP_VERSION:S/RC/rc/} | |
7 | CATEGORIES= lang | 7 | CATEGORIES= lang | |
8 | 8 | |||
9 | HOMEPAGE= http://www.php.net/ | 9 | HOMEPAGE= http://www.php.net/ | |
10 | COMMENT= PHP Hypertext Preprocessor version 7.1 | 10 | COMMENT= PHP Hypertext Preprocessor version 7.1 | |
11 | LICENSE= php | 11 | LICENSE= php | |
12 | 12 | |||
13 | TEST_TARGET= test | 13 | TEST_TARGET= test | |
14 | 14 | |||
15 | USE_TOOLS+= gmake lex pkg-config | 15 | USE_TOOLS+= gmake lex pkg-config | |
16 | LIBTOOL_OVERRIDE= # empty | 16 | LIBTOOL_OVERRIDE= # empty | |
17 | PHP_CHECK_INSTALLED= No | 17 | PHP_CHECK_INSTALLED= No | |
18 | 18 | |||
19 | PHP_VERSIONS_ACCEPTED= 71 | 19 | PHP_VERSIONS_ACCEPTED= 71 | |
20 | 20 | |||
21 | .include "Makefile.php" | 21 | .include "Makefile.php" | |
22 | 22 | |||
23 | CGIDIR= ${PREFIX}/libexec/cgi-bin | 23 | CGIDIR= ${PREFIX}/libexec/cgi-bin | |
24 | EGDIR= ${PREFIX}/share/examples/php | 24 | EGDIR= ${PREFIX}/share/examples/php | |
25 | MESSAGE_SUBST+= CGIDIR=${CGIDIR} | 25 | MESSAGE_SUBST+= CGIDIR=${CGIDIR} | |
26 | 26 | |||
27 | CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} | 27 | CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} | |
28 | MAKE_ENV+= INSTALL_ROOT=${DESTDIR} | 28 | MAKE_ENV+= INSTALL_ROOT=${DESTDIR} | |
29 | 29 | |||
30 | CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini | 30 | CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini | |
31 | PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" | 31 | PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" | |
32 | 32 | |||
33 | SUBST_CLASSES+= path | 33 | SUBST_CLASSES+= path | |
34 | SUBST_MESSAGE.path= Fixing common paths. | 34 | SUBST_MESSAGE.path= Fixing common paths. | |
35 | SUBST_STAGE.path= pre-configure | 35 | SUBST_STAGE.path= pre-configure | |
36 | SUBST_FILES.path= ext/phar/phar/phar.php | 36 | SUBST_FILES.path= ext/phar/phar/phar.php | |
37 | SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php | 37 | SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php | |
38 | SUBST_FILES.path+= sapi/cgi/Makefile.frag | 38 | SUBST_FILES.path+= sapi/cgi/Makefile.frag | |
39 | SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' | 39 | SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' | |
40 | SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' | 40 | SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' | |
41 | 41 | |||
42 | INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php | 42 | INSTALLATION_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" | |||
48 | CONFIGURE_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" | |
46 | INSTALL_UNSTRIPPED= yes | 53 | INSTALL_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].*-*) | |
52 | CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC | 59 | CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC | |
53 | .endif | 60 | .endif | |
54 | 61 | |||
55 | post-extract: | 62 | post-extract: | |
56 | cd ${WRKSRC} && \ | 63 | cd ${WRKSRC} && \ | |
57 | ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \; | 64 | ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \; | |
58 | 65 | |||
59 | post-install: | 66 | post-install: | |
60 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php | 67 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php | |
61 | ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ | 68 | ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ | |
62 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 | 69 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 | |
63 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php | 70 | ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php | |
64 | cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ | 71 | cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ | |
65 | ${DESTDIR}${EGDIR} | 72 | ${DESTDIR}${EGDIR} | |
66 | ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php | 73 | ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php | |
67 | 74 | |||
68 | .include "../../mk/bsd.pkg.mk" | 75 | .include "../../mk/bsd.pkg.mk" |