CVS commit: pkgsrc/lang/php72

["Jaromir Dolecek" <jdolecek%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jdolecek
Date:           Mon Feb  5 08:51:25 UTC 2018

Modified Files:
        pkgsrc/lang/php72: Makefile Makefile.common Makefile.php PLIST
            buildlink3.mk distinfo
Removed Files:
        pkgsrc/lang/php72/patches: patch-ext_pcre_pcrelib_config.h

Log Message:
Switch lang/php72 to use pkgsrc pcre library instead of the bundled one

PHP bundles it's own copy of pcre 8.41 with the distribution, which
is used when build doesn't find system one. Switch to the pkgsrc
pcre, so that we don't need to maintain local PHP JIT patch here.
Upcoming PHP 7.3 already switched to pcre2, so no value maintaining
private PCRE patch any more (if there ever was).

XXX devel/pcre doesn't seem to enable PCRE JIT, might be good to do so


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php72/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php72/Makefile.common \
    pkgsrc/lang/php72/PLIST pkgsrc/lang/php72/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php72/Makefile.php
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/php72/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/php72/patches/patch-ext_pcre_pcrelib_config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php72/Makefile
diff -u pkgsrc/lang/php72/Makefile:1.4 pkgsrc/lang/php72/Makefile:1.5
--- pkgsrc/lang/php72/Makefile:1.4      Sun Feb  4 16:19:00 2018
+++ pkgsrc/lang/php72/Makefile  Mon Feb  5 08:51:25 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2018/02/04 16:19:00 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2018/02/05 08:51:25 jdolecek Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
 CATEGORIES=            lang
-PKGREVISION=    1
+PKGREVISION=   2
 
 HOMEPAGE=              http://www.php.net/
 COMMENT=               PHP Hypertext Preprocessor version 7.2
@@ -42,13 +42,6 @@ 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

Index: pkgsrc/lang/php72/Makefile.common
diff -u pkgsrc/lang/php72/Makefile.common:1.1 pkgsrc/lang/php72/Makefile.common:1.2
--- pkgsrc/lang/php72/Makefile.common:1.1       Wed Nov 15 08:56:12 2017
+++ pkgsrc/lang/php72/Makefile.common   Mon Feb  5 08:51:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.2 2018/02/05 08:51:25 jdolecek Exp $
 # used by lang/php72/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php72-extensions/Makefile
@@ -18,3 +18,10 @@ CONFIGURE_ENV+=              PHP_LIBXML_SHARED="1"
 # configure test gets confused by wrappers dropping -R /usr/lib
 CONFIGURE_ARGS+=       php_cv_cc_dashr=no
 .endif
+
+# not every extension actually depend on PCRE, and those which do
+# don't use internal pcre structures, so default to build-time
+# dependency only
+BUILDLINK_DEPMETHOD.pcre?=     build
+CONFIGURE_ARGS+=       --with-pcre-dir=${BUILDLINK_PREFIX.pcre}
+.include "../../devel/pcre/buildlink3.mk"
Index: pkgsrc/lang/php72/PLIST
diff -u pkgsrc/lang/php72/PLIST:1.1 pkgsrc/lang/php72/PLIST:1.2
--- pkgsrc/lang/php72/PLIST:1.1 Wed Nov 15 08:56:12 2017
+++ pkgsrc/lang/php72/PLIST     Mon Feb  5 08:51:25 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/02/05 08:51:25 jdolecek Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -131,11 +131,6 @@ include/php/ext/mysqlnd/mysqlnd_structs.
 include/php/ext/mysqlnd/mysqlnd_vio.h
 include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
 include/php/ext/mysqlnd/php_mysqlnd.h
-include/php/ext/pcre/pcrelib/config.h
-include/php/ext/pcre/pcrelib/pcre.h
-include/php/ext/pcre/pcrelib/pcre_internal.h
-include/php/ext/pcre/pcrelib/pcreposix.h
-include/php/ext/pcre/pcrelib/ucp.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/phar/php_phar.h
 include/php/ext/session/mod_files.h
Index: pkgsrc/lang/php72/buildlink3.mk
diff -u pkgsrc/lang/php72/buildlink3.mk:1.1 pkgsrc/lang/php72/buildlink3.mk:1.2
--- pkgsrc/lang/php72/buildlink3.mk:1.1 Wed Nov 15 08:56:12 2017
+++ pkgsrc/lang/php72/buildlink3.mk     Mon Feb  5 08:51:25 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/02/05 08:51:25 jdolecek Exp $
 
 BUILDLINK_TREE+=       php
 
 .if !defined(PHP_BUILDLINK3_MK)
 PHP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.php+=    php>=7.2.0rc1<7.3
-BUILDLINK_ABI_DEPENDS.php+=    php>=7.2.0rc1<7.3
+BUILDLINK_API_DEPENDS.php+=    php>=7.2.2nb2<7.3
+BUILDLINK_ABI_DEPENDS.php+=    php>=7.2.2nb2<7.3
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php72
 
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/lang/php72/Makefile.php
diff -u pkgsrc/lang/php72/Makefile.php:1.3 pkgsrc/lang/php72/Makefile.php:1.4
--- pkgsrc/lang/php72/Makefile.php:1.3  Sun Feb  4 16:19:00 2018
+++ pkgsrc/lang/php72/Makefile.php      Mon Feb  5 08:51:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.3 2018/02/04 16:19:00 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.4 2018/02/05 08:51:25 jdolecek Exp $
 # used by lang/php72/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -8,6 +8,9 @@
 GCC_REQD+=              4.9
 .endif
 
+# the binary actually needs full dep on PCRE
+BUILDLINK_DEPMETHOD.pcre=      full
+
 .include "../../lang/php72/Makefile.common"
 
 DISTINFO_FILE= ${.CURDIR}/../../lang/php72/distinfo
@@ -44,6 +47,8 @@ CONFIGURE_ARGS+=      --enable-xml
 CONFIGURE_ARGS+=       --with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
+CONFIGURE_ARGS+=       --with-pcre-regex=${BUILDLINK_PREFIX.pcre}
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
 PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline argon2 sqlite3
 PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline sqlite3

Index: pkgsrc/lang/php72/distinfo
diff -u pkgsrc/lang/php72/distinfo:1.15 pkgsrc/lang/php72/distinfo:1.16
--- pkgsrc/lang/php72/distinfo:1.15     Sun Feb  4 16:19:00 2018
+++ pkgsrc/lang/php72/distinfo  Mon Feb  5 08:51:25 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2018/02/04 16:19:00 jdolecek Exp $
+$NetBSD: distinfo,v 1.16 2018/02/05 08:51:25 jdolecek Exp $
 
 SHA1 (php-7.2.2.tar.bz2) = 69903dabf7ceb4a84620683092e235b29d2d1066
 RMD160 (php-7.2.2.tar.bz2) = c7193e0298ae8e709ad19129023ff213085f50ca
@@ -7,7 +7,6 @@ Size (php-7.2.2.tar.bz2) = 14618006 byte
 SHA1 (patch-configure) = 5dad0ba760f5fb6aa55dc3136655b78c29e23bca
 SHA1 (patch-ext_gd_config.m4) = 67730ccc13410adaf8829f77a6b044f16e412489
 SHA1 (patch-ext_imap_config.m4) = 6a667b2580901dccfd0174aec56dad629689d7bd
-SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
 SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb