]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #16260 from poettering/pcre2-dlopen
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 4 Aug 2020 13:37:48 +0000 (15:37 +0200)
committerGitHub <noreply@github.com>
Tue, 4 Aug 2020 13:37:48 +0000 (15:37 +0200)
turn pcre2 dependency into dlopen() dependency

1  2 
TODO
meson.build
src/journal/journalctl.c

diff --cc TODO
Simple merge
diff --cc meson.build
index e4c95c9c32c77eead7050f2d185a9af083a5ab08,170e3daec8c3e81ce3f00b613dea5aedfd052ced..134e95d4756f3759e318936174fc201c5f8996e1
@@@ -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)
index 5a56a990f96edf3038a0d59e280d706ab94a245c,a957ac1237700ebb0e9d56de247987f29024bda9..79daa43494db41d73d0d4df7e98817015e4706c5
@@@ -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"