CVS commit: pkgsrc/devel/pcre2

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Sep 14 09:35:01 UTC 2022

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/pcre2/Makefile
cvs rdiff -u -r1.2 -r1.3 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.23 pkgsrc/devel/pcre2/Makefile:1.24
--- pkgsrc/devel/pcre2/Makefile:1.23    Wed Apr 20 20:14:48 2022
+++ pkgsrc/devel/pcre2/Makefile Wed Sep 14 09:35:01 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2022/04/20 20:14:48 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2022/09/14 09:35:01 wiz Exp $
 
 DISTNAME=      pcre2-10.40
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=PhilipHazel/}
 GITHUB_RELEASE=        ${DISTNAME}

Index: pkgsrc/devel/pcre2/options.mk
diff -u pkgsrc/devel/pcre2/options.mk:1.2 pkgsrc/devel/pcre2/options.mk:1.3
--- pkgsrc/devel/pcre2/options.mk:1.2   Thu Sep  7 14:50:44 2017
+++ pkgsrc/devel/pcre2/options.mk       Wed Sep 14 09:35:01 2022
@@ -1,18 +1,22 @@
-# $NetBSD: options.mk,v 1.2 2017/09/07 14:50:44 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2022/09/14 09:35:01 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pcre2
 PKG_SUPPORTED_OPTIONS= pcre2-jit
 
+.include "../../mk/bsd.options.mk"
+
 .if (${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE_ARCH} == "mips" || \
     ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "sparc" || \
     (!empty(MACHINE_ARCH:M*arm*) && empty(MACHINE_ARCH:M*armv4*)))
+.if ${OPSYS} != "NetBSD"
+# causes core dumps in rspamd
+# https://mail-index.netbsd.org/pkgsrc-users/2022/09/11/msg036184.html
 PKG_SUGGESTED_OPTIONS= pcre2-jit
 .endif
-
-.include "../../mk/bsd.options.mk"
+.endif
 
 .if !empty(PKG_OPTIONS:Mpcre2-jit)
 CONFIGURE_ARGS+=       --enable-jit