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 7cf2ff09ca6bc6160b8a1d2aa201f7b63e495615..95122213682c594e89a74caa3765f96007e5f49c 100644 (file)
--- 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 c478d46f31e3561837bef2ad6465645590c65ad4..9de167f4cf366022f6a273dac4ad23c4ebc24b1b 100644 (file)
--- 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