From 1c20c9f4fce3b2eb501a776fb6025d6b5567fc00 Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Tue, 27 Feb 2024 07:36:46 +0100 Subject: [PATCH] move dlfcn-util into basic I'm going to dlopen_many_sym_or_warn() in src/basic/compress.c, this will introduce a circular dependency because libshared already depends from libbasic. To avoid this, move dlfcn-util.c from libshared to libbasic. --- src/{shared => basic}/dlfcn-util.c | 0 src/{shared => basic}/dlfcn-util.h | 0 src/basic/meson.build | 1 + src/shared/meson.build | 1 - 4 files changed, 1 insertion(+), 1 deletion(-) rename src/{shared => basic}/dlfcn-util.c (100%) rename src/{shared => basic}/dlfcn-util.h (100%) diff --git a/src/shared/dlfcn-util.c b/src/basic/dlfcn-util.c similarity index 100% rename from src/shared/dlfcn-util.c rename to src/basic/dlfcn-util.c diff --git a/src/shared/dlfcn-util.h b/src/basic/dlfcn-util.h similarity index 100% rename from src/shared/dlfcn-util.h rename to src/basic/dlfcn-util.h diff --git a/src/basic/meson.build b/src/basic/meson.build index a9722d2121cc3..b5c9938370266 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -21,6 +21,7 @@ basic_sources = files( 'confidential-virt.c', 'devnum-util.c', 'dirent-util.c', + 'dlfcn-util.c', 'efivars.c', 'env-file.c', 'env-util.c', diff --git a/src/shared/meson.build b/src/shared/meson.build index fe0c9c1f2fa20..7d1dee68ab237 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -55,7 +55,6 @@ shared_sources = files( 'device-nodes.c', 'discover-image.c', 'dissect-image.c', - 'dlfcn-util.c', 'dm-util.c', 'dns-domain.c', 'dropin.c',