[libvirt PATCH 4/6] tests: openvzutilstest: Remove duplicate linking with libvirt_openvz.a

Tim Wiederhake twiederh at redhat.com
Mon May 3 10:01:44 UTC 2021


"openvzutilstest" links, amongst others, against "libvirt_openvz.a" and
"libvirt.so". The latter also links against "libvirt_openvz.a", leading
to a One-Definition-Rule violation for "openvzLocateConfFile" in
"openvz_conf.c".

Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 src/libvirt_openvz.syms | 2 ++
 tests/meson.build       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libvirt_openvz.syms b/src/libvirt_openvz.syms
index ac0ed0d23e..a1038e51a4 100644
--- a/src/libvirt_openvz.syms
+++ b/src/libvirt_openvz.syms
@@ -3,10 +3,12 @@
 #
 
 # openvz/openvz_conf.h
+openvzCapsInit;
 openvzLocateConfFile;
 openvzReadConfigParam;
 openvzReadNetworkConf;
 openvzVEGetStringParam;
+openvzXMLOption;
 
 # Let emacs know we want case-insensitive sorting
 # Local Variables:
diff --git a/tests/meson.build b/tests/meson.build
index 9900983d0c..3c73cbe3b5 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -430,7 +430,7 @@ endif
 
 if conf.has('WITH_OPENVZ')
   tests += [
-    { 'name': 'openvzutilstest', 'link_with': [ openvz_lib ] },
+    { 'name': 'openvzutilstest' },
   ]
 endif
 
-- 
2.26.3




More information about the libvir-list mailing list