CVS commit: pkgsrc/devel/pcre2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep  7 13:47:21 UTC 2017

Modified Files:
        pkgsrc/devel/pcre2: Makefile
Added Files:
        pkgsrc/devel/pcre2: options.mk

Log Message:
Make JIT an option. Enable it by default on the list of platforms
martin@ extracted from the source, see PR 52524.

The pattern matching and/or the list itself may need further fixes.

Retest on NetBSD 8 shows that the binaries are now mprotect-safe,
remove variable.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/pcre2/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/pcre2/options.mk

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

Modified files:

Index: pkgsrc/devel/pcre2/Makefile
diff -u pkgsrc/devel/pcre2/Makefile:1.9 pkgsrc/devel/pcre2/Makefile:1.10
--- pkgsrc/devel/pcre2/Makefile:1.9     Thu Aug 17 19:53:54 2017
+++ pkgsrc/devel/pcre2/Makefile Thu Sep  7 13:47:21 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2017/08/17 19:53:54 nros Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/07 13:47:21 wiz Exp $
 
 DISTNAME=      pcre2-10.30
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
 MASTER_SITES+= https://ftp.pcre.org/pub/pcre/
@@ -15,7 +16,6 @@ LICENSE=      modified-bsd
 USE_LANGUAGES=         c
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-jit
 
 PKGCONFIG_OVERRIDE+=   libpcre2-16.pc.in
 PKGCONFIG_OVERRIDE+=   libpcre2-posix.pc.in
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=      --enable-pcre2grep-libb
 
 TEST_TARGET=           check
 
-NOT_PAX_MPROTECT_SAFE= bin/pcre2grep bin/pcre2test
+.include "options.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Added files:

Index: pkgsrc/devel/pcre2/options.mk
diff -u /dev/null pkgsrc/devel/pcre2/options.mk:1.1
--- /dev/null   Thu Sep  7 13:47:21 2017
+++ pkgsrc/devel/pcre2/options.mk       Thu Sep  7 13:47:21 2017
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2017/09/07 13:47:21 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.pcre2
+PKG_SUPPORTED_OPTIONS= pcre2-jit
+
+.if (${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "x86_64" || \
+    ${MACHINE_ARCH} == "mips" || \
+    ${MACHINE_ARCH} == "powerpc" || \
+    ${MACHINE_ARCH} == "sparc" || \
+    (!empty(MACHINE_ARCH:Marm) && empty(MACHINE_ARCH:Marmv4)))
+PKG_SUGGESTED_OPTIONS= pcre2-jit
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpcre2-jit)
+CONFIGURE_ARGS+=       --enable-jit
+.endif