mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Artur Wiebe <artur@4wiebe.de>
To: ptxdist@pengutronix.de
Cc: Artur Wiebe <artur@4wiebe.de>
Subject: [ptxdist] [PATCH] systemd: regexp matching support using pcre2
Date: Thu, 16 Feb 2023 10:19:21 +0100	[thread overview]
Message-ID: <20230216091921.1816952-1-artur@4wiebe.de> (raw)

Signed-off-by: Artur Wiebe <artur@4wiebe.de>
---
 rules/systemd.in   | 5 +++++
 rules/systemd.make | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/rules/systemd.in b/rules/systemd.in
index 17997574b..e18bdb24f 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -23,6 +23,7 @@ menuconfig SYSTEMD
 	select XZ		if SYSTEMD_XZ
 	select LZ4		if SYSTEMD_LZ4
 	select ZSTD		if SYSTEMD_ZSTD
+	select PCRE2		if SYSTEMD_PCRE2
 	select LIBMICROHTTPD	if SYSTEMD_MICROHTTPD
 	select LIBSECCOMP	if SYSTEMD_SECCOMP
 	select IPTABLES		if SYSTEMD_IPMASQUERADE
@@ -180,6 +181,10 @@ config SYSTEMD_ZSTD
 	bool
 	prompt "ZSTD compressed journal support"
 
+config SYSTEMD_PCRE2
+	bool
+	prompt "regexp matching support using pcre2"
+
 config SYSTEMD_JOURNAL_REMOTE
 	bool
 	select SYSTEMD_MICROHTTPD
diff --git a/rules/systemd.make b/rules/systemd.make
index 7e085f49d..298b05702 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -151,7 +151,7 @@ SYSTEMD_CONF_OPT	:= \
 	-Doss-fuzz=false \
 	-Dp11kit=false \
 	-Dpam=false \
-	-Dpcre2=false \
+	-Dpcre2=$(call ptx/truefalse,PTXCONF_SYSTEMD_PCRE2) \
 	-Dpolkit=$(call ptx/truefalse,PTXCONF_SYSTEMD_POLKIT) \
 	-Dportabled=false \
 	-Dpstore=false \
-- 
2.39.1




             reply	other threads:[~2023-02-16  9:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-16  9:19 Artur Wiebe [this message]
2023-02-17 15:36 ` [ptxdist] [APPLIED] " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230216091921.1816952-1-artur@4wiebe.de \
    --to=artur@4wiebe.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox