summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-09-07 13:47:21 +0000
committerwiz <wiz@pkgsrc.org>2017-09-07 13:47:21 +0000
commitc299e0b4ea435d6ee12da76b86c9b87d1c3da726 (patch)
tree8f44780ac28ef8b681abca3b3b6175c754a9fed0 /devel
parent6c7f1c6cd74039df0a4046d6326981054112febb (diff)
downloadpkgsrc-c299e0b4ea435d6ee12da76b86c9b87d1c3da726.tar.gz
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.
Diffstat (limited to 'devel')
-rw-r--r--devel/pcre2/Makefile6
-rw-r--r--devel/pcre2/options.mk19
2 files changed, 22 insertions, 3 deletions
diff --git a/devel/pcre2/Makefile b/devel/pcre2/Makefile
index ddcee1ee687..892ccd497d9 100644
--- a/devel/pcre2/Makefile
+++ b/devel/pcre2/Makefile
@@ -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-libbz2
TEST_TARGET= check
-NOT_PAX_MPROTECT_SAFE= bin/pcre2grep bin/pcre2test
+.include "options.mk"
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/pcre2/options.mk b/devel/pcre2/options.mk
new file mode 100644
index 00000000000..7eb696d2462
--- /dev/null
+++ b/devel/pcre2/options.mk
@@ -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