pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

unit: add more logic for regular expressions support.



Module Name:	pkgsrc-wip
Committed By:	Sergey A. Osokin <osa%FreeBSD.org@localhost>
Pushed By:	osa
Date:		Mon Nov 23 11:41:39 2020 -0500
Changeset:	cb2749c39517748b898fad179b088567e0120594

Modified Files:
	unit/options.mk

Log Message:
unit: add more logic for regular expressions support.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cb2749c39517748b898fad179b088567e0120594

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

diffstat:
 unit/options.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diffs:
diff --git a/unit/options.mk b/unit/options.mk
index 449f23d235..63ab2b9e4d 100644
--- a/unit/options.mk
+++ b/unit/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unit
-PKG_SUPPORTED_OPTIONS=	debug inet6 pcre2 ssl
+PKG_SUPPORTED_OPTIONS=	debug inet6 pcre pcre2 ssl
 PKG_SUGGESTED_OPTIONS=	inet6 pcre2 ssl
 
 .include "../../mk/bsd.options.mk"
@@ -14,10 +14,15 @@ CONFIGURE_ARGS+=	--debug
 CONFIGURE_ARGS+=	--no-ipv6
 .endif
 
-.if empty(PKG_OPTIONS:Mpcre2)
+.if empty(PKG_OPTIONS:Mpcre) && empty(PKG_OPTIONS:Mpcre2)
 CONFIGURE_ARGS+=	--no-regex
 .endif
 
+.if !empty(PKG_OPTIONS:Mpcre)
+CONFIGURE_ARGS+=	--no-pcre2
+.include "../../devel/pcre/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mpcre2)
 .include "../../devel/pcre2/buildlink3.mk"
 .endif


Home | Main Index | Thread Index | Old Index