External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: remove '.libs' from all relevant paths

Browse Source 
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 <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-05-28 02:40:50 +02:00
parent af8611916a
commit 018f7fa8dc
15 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/systemtap/lock-debug.stp
View File

@ -12,7 +12,7 @@
# source git directory, it should be only slight modification to the following: # source git directory, it should be only slight modification to the following:
# #
# ./run stap --ldd -c src/libvirtd -d src/libvirtd # ./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. # Debug RWLock mechanisms as well.
# #

2
run.in
View File

@ -50,7 +50,7 @@ prepend()
# Find this script. # Find this script.
b=@abs_builddir@ b=@abs_builddir@
prepend LD_LIBRARY_PATH "$b/src/.libs" prepend LD_LIBRARY_PATH "$b/src"
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
prepend PKG_CONFIG_PATH "$b/src" prepend PKG_CONFIG_PATH "$b/src"

2
src/driver.c
View File

@ -56,7 +56,7 @@ virDriverLoadModule(const char *name,
if (!(modfile = virFileFindResourceFull(name, if (!(modfile = virFileFindResourceFull(name,
"libvirt_driver_", "libvirt_driver_",
".so", ".so",
abs_top_builddir "/src/.libs", abs_top_builddir "/src",
DEFAULT_DRIVER_DIR, DEFAULT_DRIVER_DIR,
"LIBVIRT_DRIVER_DIR"))) "LIBVIRT_DRIVER_DIR")))
return -1; return -1;

2
src/libvirt-lxc.pc.in
View File

@ -4,7 +4,7 @@
prefix=@abs_top_builddir@ prefix=@abs_top_builddir@
exec_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 includedir=@abs_top_builddir@/include
source_includedir=@abs_top_srcdir@/include source_includedir=@abs_top_srcdir@/include
datarootdir=@abs_top_builddir@ datarootdir=@abs_top_builddir@

2
src/libvirt-qemu.pc.in
View File

@ -4,7 +4,7 @@
prefix=@abs_top_builddir@ prefix=@abs_top_builddir@
exec_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 includedir=@abs_top_builddir@/include
source_includedir=@abs_top_srcdir@/include source_includedir=@abs_top_srcdir@/include
datarootdir=@abs_top_builddir@ datarootdir=@abs_top_builddir@

2
src/libvirt.pc.in
View File

@ -4,7 +4,7 @@
prefix=@abs_top_builddir@ prefix=@abs_top_builddir@
exec_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 includedir=@abs_top_builddir@/include
source_includedir=@abs_top_srcdir@/include source_includedir=@abs_top_srcdir@/include
datarootdir=@abs_top_builddir@ datarootdir=@abs_top_builddir@

2
src/locking/lock_manager.c
View File

@ -139,7 +139,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name,
if (!(modfile = virFileFindResourceFull(name, if (!(modfile = virFileFindResourceFull(name,
NULL, NULL,
".so", ".so",
abs_top_builddir "/src/.libs", abs_top_builddir "/src",
LIBDIR "/libvirt/lock-driver", LIBDIR "/libvirt/lock-driver",
"LIBVIRT_LOCK_MANAGER_PLUGIN_DIR"))) "LIBVIRT_LOCK_MANAGER_PLUGIN_DIR")))
goto cleanup; goto cleanup;

2
src/storage/storage_backend.c
View File

@ -92,7 +92,7 @@ virStorageDriverLoadBackendModule(const char *name,
if (!(modfile = virFileFindResourceFull(name, if (!(modfile = virFileFindResourceFull(name,
"libvirt_storage_backend_", "libvirt_storage_backend_",
".so", ".so",
abs_top_builddir "/src/.libs", abs_top_builddir "/src",
STORAGE_BACKEND_MODULE_DIR, STORAGE_BACKEND_MODULE_DIR,
"LIBVIRT_STORAGE_BACKEND_DIR"))) "LIBVIRT_STORAGE_BACKEND_DIR")))
return -1; return -1;

2
src/util/virstoragefilebackend.c
View File

@ -57,7 +57,7 @@ virStorageFileLoadBackendModule(const char *name,
if (!(modfile = virFileFindResourceFull(name, if (!(modfile = virFileFindResourceFull(name,
"libvirt_storage_file_", "libvirt_storage_file_",
".so", ".so",
abs_top_builddir "/src/.libs", abs_top_builddir "/src",
STORAGE_FILE_MODULE_DIR, STORAGE_FILE_MODULE_DIR,
"LIBVIRT_STORAGE_FILE_DIR"))) "LIBVIRT_STORAGE_FILE_DIR")))
return -1; return -1;

2
tests/securityselinuxlabeltest.c
View File

@ -374,4 +374,4 @@ mymain(void)
VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MAIN_PRELOAD(mymain,
VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("domaincaps"),
abs_builddir "/.libs/libsecurityselinuxhelper.so") abs_builddir "/libsecurityselinuxhelper.so")

2
tests/securityselinuxtest.c
View File

@ -339,4 +339,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; 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")

4
tests/shunloadtest.c
View File

@ -105,8 +105,8 @@ int main(int argc G_GNUC_UNUSED, char **argv)
fprintf(stderr, " .%*s 1 ", 39, ""); fprintf(stderr, " .%*s 1 ", 39, "");
signal(SIGSEGV, sigHandler); signal(SIGSEGV, sigHandler);
if (!(lib = dlopen("./.libs/libshunload.so", RTLD_LAZY))) { if (!(lib = dlopen(abs_builddir "/libshunload.so", RTLD_LAZY))) {
fprintf(stderr, "Cannot load ./.libs/libshunload.so %s\n", dlerror()); fprintf(stderr, "Cannot load ./libshunload.so %s\n", dlerror());
return 1; return 1;
} }
if (!(startup = dlsym(lib, "shunloadStart"))) { if (!(startup = dlsym(lib, "shunloadStart"))) {

2
tests/testutils.h
View File

@ -140,7 +140,7 @@ int virTestMain(int argc,
return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \ 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); virCapsPtr virTestGenericCapsInit(void);
virCapsHostNUMAPtr virTestCapsBuildNUMATopology(int seq); virCapsHostNUMAPtr virTestCapsBuildNUMATopology(int seq);

2
tests/viridentitytest.c
View File

@ -158,7 +158,7 @@ mymain(void)
} }
#if WITH_SELINUX #if WITH_SELINUX
VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so")
#else #else
VIR_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#endif #endif

2
tests/virt-aa-helper-test
View File

@ -15,7 +15,7 @@ fi
output="/dev/null" output="/dev/null"
use_valgrind="" use_valgrind=""
ld_library_path="../src/.libs/" ld_library_path="../src/"
if [ ! -z "$1" ] && [ "$1" = "-d" ]; then if [ ! -z "$1" ] && [ "$1" = "-d" ]; then
output="/dev/stdout" output="/dev/stdout"
shift shift