From 018f7fa8dc958731f09a79580819ccb37e427d11 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 28 May 2020 02:40:50 +0200 Subject: [PATCH] meson: remove '.libs' from all relevant paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meson doesn't use .libs directory, everything is placed directly into directories where meson.build file is used. In order to have working tests and running libvirt directly from GIT we need to fix all the paths pointing '.libs' directory. Signed-off-by: Pavel Hrdina Reviewed-by: Ján Tomko Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- examples/systemtap/lock-debug.stp | 2 +- run.in | 2 +- src/driver.c | 2 +- src/libvirt-lxc.pc.in | 2 +- src/libvirt-qemu.pc.in | 2 +- src/libvirt.pc.in | 2 +- src/locking/lock_manager.c | 2 +- src/storage/storage_backend.c | 2 +- src/util/virstoragefilebackend.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 2 +- tests/shunloadtest.c | 4 ++-- tests/testutils.h | 2 +- tests/viridentitytest.c | 2 +- tests/virt-aa-helper-test | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-debug.stp index 0c9cc38692..a68a385569 100644 --- a/examples/systemtap/lock-debug.stp +++ b/examples/systemtap/lock-debug.stp @@ -12,7 +12,7 @@ # source git directory, it should be only slight modification to the following: # # ./run stap --ldd -c src/libvirtd -d src/libvirtd -# examples/systemtap/lock-debug.stp src/.libs/libvirt.so +# examples/systemtap/lock-debug.stp src/libvirt.so # # Debug RWLock mechanisms as well. # diff --git a/run.in b/run.in index d508e64802..1a0dee4d9e 100644 --- a/run.in +++ b/run.in @@ -50,7 +50,7 @@ prepend() # Find this script. b=@abs_builddir@ -prepend LD_LIBRARY_PATH "$b/src/.libs" +prepend LD_LIBRARY_PATH "$b/src" export LD_LIBRARY_PATH prepend PKG_CONFIG_PATH "$b/src" diff --git a/src/driver.c b/src/driver.c index e7452106ed..37bf9de392 100644 --- a/src/driver.c +++ b/src/driver.c @@ -56,7 +56,7 @@ virDriverLoadModule(const char *name, if (!(modfile = virFileFindResourceFull(name, "libvirt_driver_", ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", DEFAULT_DRIVER_DIR, "LIBVIRT_DRIVER_DIR"))) return -1; diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in index 9243bcf903..f6d4dd71e7 100644 --- a/src/libvirt-lxc.pc.in +++ b/src/libvirt-lxc.pc.in @@ -4,7 +4,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ -libdir=@abs_top_builddir@/src/.libs +libdir=@abs_top_builddir@/src includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in index a4f9e65c03..b224679d7e 100644 --- a/src/libvirt-qemu.pc.in +++ b/src/libvirt-qemu.pc.in @@ -4,7 +4,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ -libdir=@abs_top_builddir@/src/.libs +libdir=@abs_top_builddir@/src includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in index a16e455210..93a42a457b 100644 --- a/src/libvirt.pc.in +++ b/src/libvirt.pc.in @@ -4,7 +4,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ -libdir=@abs_top_builddir@/src/.libs +libdir=@abs_top_builddir@/src includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 07318fb53f..39e482f11c 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -139,7 +139,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, if (!(modfile = virFileFindResourceFull(name, NULL, ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", LIBDIR "/libvirt/lock-driver", "LIBVIRT_LOCK_MANAGER_PLUGIN_DIR"))) goto cleanup; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e9f6663e6d..1f83236f2f 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -92,7 +92,7 @@ virStorageDriverLoadBackendModule(const char *name, if (!(modfile = virFileFindResourceFull(name, "libvirt_storage_backend_", ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", STORAGE_BACKEND_MODULE_DIR, "LIBVIRT_STORAGE_BACKEND_DIR"))) return -1; diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefilebackend.c index f362436d9b..bf452a1dc5 100644 --- a/src/util/virstoragefilebackend.c +++ b/src/util/virstoragefilebackend.c @@ -57,7 +57,7 @@ virStorageFileLoadBackendModule(const char *name, if (!(modfile = virFileFindResourceFull(name, "libvirt_storage_file_", ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", STORAGE_FILE_MODULE_DIR, "LIBVIRT_STORAGE_FILE_DIR"))) return -1; diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 50b447c163..2989a668b7 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -374,4 +374,4 @@ mymain(void) VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("domaincaps"), - abs_builddir "/.libs/libsecurityselinuxhelper.so") + abs_builddir "/libsecurityselinuxhelper.so") diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 3f069c2d6b..ae4b08b9d8 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -339,4 +339,4 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so") diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index b377c07294..d4ab3cd5ac 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -105,8 +105,8 @@ int main(int argc G_GNUC_UNUSED, char **argv) fprintf(stderr, " .%*s 1 ", 39, ""); signal(SIGSEGV, sigHandler); - if (!(lib = dlopen("./.libs/libshunload.so", RTLD_LAZY))) { - fprintf(stderr, "Cannot load ./.libs/libshunload.so %s\n", dlerror()); + if (!(lib = dlopen(abs_builddir "/libshunload.so", RTLD_LAZY))) { + fprintf(stderr, "Cannot load ./libshunload.so %s\n", dlerror()); return 1; } if (!(startup = dlsym(lib, "shunloadStart"))) { diff --git a/tests/testutils.h b/tests/testutils.h index 3f32aa7200..ff5c98a078 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -140,7 +140,7 @@ int virTestMain(int argc, return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \ } -#define VIR_TEST_MOCK(mock) (abs_builddir "/.libs/lib" mock "mock" MOCK_EXT) +#define VIR_TEST_MOCK(mock) (abs_builddir "/lib" mock "mock" MOCK_EXT) virCapsPtr virTestGenericCapsInit(void); virCapsHostNUMAPtr virTestCapsBuildNUMATopology(int seq); diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index 9a8c8914d3..fd01eeaa80 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -158,7 +158,7 @@ mymain(void) } #if WITH_SELINUX -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so") #else VIR_TEST_MAIN(mymain) #endif diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test index 6a6703ecf5..8dbe82a6b9 100755 --- a/tests/virt-aa-helper-test +++ b/tests/virt-aa-helper-test @@ -15,7 +15,7 @@ fi output="/dev/null" use_valgrind="" -ld_library_path="../src/.libs/" +ld_library_path="../src/" if [ ! -z "$1" ] && [ "$1" = "-d" ]; then output="/dev/stdout" shift