From: Tim Wiederhake <twiederh@redhat.com>
Date: Thu, 6 May 2021 15:08:37 +0000 (+0200)
Subject: virt-aa-helper: Remove duplicate linking with src/datatypes.o
X-Git-Tag: v7.5.0-rc1~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ac97ef8a3e915fbb12d8eb2d6d23f56b219765b;p=thirdparty%2Flibvirt.git

virt-aa-helper: Remove duplicate linking with src/datatypes.o

"virt-aa-helper" links, amongst others, against "datatypes.o" and
"libvirt.so". The latter links against "libvirt_driver.a" which in turn
also links against "datatypes.o", leading to a One-Definition-Rule
violoation for "virConnectClass" et al. in "datatypes.c".

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/security/meson.build b/src/security/meson.build
index 416fec7900..6f5e1dec1d 100644
--- a/src/security/meson.build
+++ b/src/security/meson.build
@@ -41,7 +41,6 @@ if conf.has('WITH_LIBVIRTD') and conf.has('WITH_APPARMOR')
     'name': 'virt-aa-helper',
     'sources': [
       apparmor_helper_sources,
-      datatypes_sources,
       dtrace_gen_objects,
     ],
     'include': [