From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 21 Jun 2021 21:28:46 +0000 (+0200)
Subject: basic,shared: move dlopen helpers to shared/
X-Git-Tag: v249-rc2~23^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d32453bc808a061a45bc5d345746a7c99b4b52f;p=thirdparty%2Fsystemd.git

basic,shared: move dlopen helpers to shared/

This was added in 88d775b734644f26fb490836769c2bc275498fde,
with the apparent intent of using in shared/ and the rest of our code.
It doesn't matter much for our code, since libdl is part of glibc anyway,
but moving it removes one linkage from libsystemd. (libshared was already
linking to libdl explicitly).
---

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 7cf2ff09ca6..95122213682 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -42,8 +42,6 @@ basic_sources = files('''
         def.h
         dirent-util.c
         dirent-util.h
-        dlfcn-util.c
-        dlfcn-util.h
         dns-def.h
         efivars.c
         efivars.h
@@ -396,8 +394,7 @@ libbasic = static_library(
                         libcap,
                         libseccomp,
                         libselinux,
-                        libm,
-                        libdl],
+                        libm],
         c_args : ['-fvisibility=default'],
         install : false)
 
diff --git a/src/basic/dlfcn-util.c b/src/shared/dlfcn-util.c
similarity index 100%
rename from src/basic/dlfcn-util.c
rename to src/shared/dlfcn-util.c
diff --git a/src/basic/dlfcn-util.h b/src/shared/dlfcn-util.h
similarity index 100%
rename from src/basic/dlfcn-util.h
rename to src/shared/dlfcn-util.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index c478d46f31e..9de167f4cf3 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -87,6 +87,8 @@ shared_sources = files('''
         discover-image.h
         dissect-image.c
         dissect-image.h
+        dlfcn-util.c
+        dlfcn-util.h
         dm-util.c
         dm-util.h
         dns-domain.c