Wed Sep 14 09:35:01 2022 UTC ()
pcre2: disable JIT by default on NetBSD

See
https://mail-index.netbsd.org/pkgsrc-users/2022/09/11/msg036184.html
for more details.

Bump PKGREVISION.


(wiz)
diff -r1.23 -r1.24 pkgsrc/devel/pcre2/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/pcre2/options.mk

cvs diff -r1.23 -r1.24 pkgsrc/devel/pcre2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/pcre2/Makefile 2022/04/20 20:14:48 1.23
+++ pkgsrc/devel/pcre2/Makefile 2022/09/14 09:35:01 1.24
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.23 2022/04/20 20:14:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2022/09/14 09:35:01 wiz Exp $
2 2
3DISTNAME= pcre2-10.40 3DISTNAME= pcre2-10.40
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=PhilipHazel/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=PhilipHazel/}
6GITHUB_RELEASE= ${DISTNAME} 7GITHUB_RELEASE= ${DISTNAME}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.pcre.org/ 10HOMEPAGE= https://www.pcre.org/
10COMMENT= Perl Compatible Regular Expressions library (major version 2) 11COMMENT= Perl Compatible Regular Expressions library (major version 2)
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13USE_LANGUAGES= c 14USE_LANGUAGES= c
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16 17

cvs diff -r1.2 -r1.3 pkgsrc/devel/pcre2/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/pcre2/options.mk 2017/09/07 14:50:44 1.2
+++ pkgsrc/devel/pcre2/options.mk 2022/09/14 09:35:01 1.3
@@ -1,19 +1,23 @@ @@ -1,19 +1,23 @@
1# $NetBSD: options.mk,v 1.2 2017/09/07 14:50:44 wiz Exp $ 1# $NetBSD: options.mk,v 1.3 2022/09/14 09:35:01 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pcre2 3PKG_OPTIONS_VAR= PKG_OPTIONS.pcre2
4PKG_SUPPORTED_OPTIONS= pcre2-jit 4PKG_SUPPORTED_OPTIONS= pcre2-jit
5 5
 6.include "../../mk/bsd.options.mk"
 7
6.if (${MACHINE_ARCH} == "i386" || \ 8.if (${MACHINE_ARCH} == "i386" || \
7 ${MACHINE_ARCH} == "x86_64" || \ 9 ${MACHINE_ARCH} == "x86_64" || \
8 ${MACHINE_ARCH} == "mips" || \ 10 ${MACHINE_ARCH} == "mips" || \
9 ${MACHINE_ARCH} == "powerpc" || \ 11 ${MACHINE_ARCH} == "powerpc" || \
10 ${MACHINE_ARCH} == "sparc" || \ 12 ${MACHINE_ARCH} == "sparc" || \
11 (!empty(MACHINE_ARCH:M*arm*) && empty(MACHINE_ARCH:M*armv4*))) 13 (!empty(MACHINE_ARCH:M*arm*) && empty(MACHINE_ARCH:M*armv4*)))
 14.if ${OPSYS} != "NetBSD"
 15# causes core dumps in rspamd
 16# https://mail-index.netbsd.org/pkgsrc-users/2022/09/11/msg036184.html
12PKG_SUGGESTED_OPTIONS= pcre2-jit 17PKG_SUGGESTED_OPTIONS= pcre2-jit
13.endif 18.endif
14 19.endif
15.include "../../mk/bsd.options.mk" 
16 20
17.if !empty(PKG_OPTIONS:Mpcre2-jit) 21.if !empty(PKG_OPTIONS:Mpcre2-jit)
18CONFIGURE_ARGS+= --enable-jit 22CONFIGURE_ARGS+= --enable-jit
19.endif 23.endif