From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 4 Aug 2020 13:37:48 +0000 (+0200)
Subject: Merge pull request #16260 from poettering/pcre2-dlopen
X-Git-Tag: v247-rc1~457
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1472b588355584f9a6a164c91b28609c1b2822de;p=thirdparty%2Fsystemd.git

Merge pull request #16260 from poettering/pcre2-dlopen

turn pcre2 dependency into dlopen() dependency
---

1472b588355584f9a6a164c91b28609c1b2822de
diff --cc meson.build
index e4c95c9c32c,170e3daec8c..134e95d4756
--- a/meson.build
+++ b/meson.build
@@@ -1799,11 -1795,11 +1799,11 @@@ public_programs += executable
          include_directories : includes,
          link_with : [libshared],
          dependencies : [threads,
 -                        libqrencode,
 +                        libdl,
                          libxz,
                          liblz4,
-                         libpcre2,
-                         libzstd],
+                         libzstd,
+                         libdl],
          install_rpath : rootlibexecdir,
          install : true,
          install_dir : rootbindir)
diff --cc src/journal/journalctl.c
index 5a56a990f96,a957ac12377..79daa43494d
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@@ -56,8 -56,8 +56,9 @@@
  #include "pager.h"
  #include "parse-util.h"
  #include "path-util.h"
+ #include "pcre2-dlopen.h"
  #include "pretty-print.h"
 +#include "random-util.h"
  #include "rlimit-util.h"
  #include "set.h"
  #include "sigbus.h"