53a4a5c7fa
have a gnutls that uses libgcrypt. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=316
104 lines
3.4 KiB
Diff
104 lines
3.4 KiB
Diff
commit 5a0ea4b7b9af2231ed161b94f9af65375c6ee9c2
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Mon Oct 21 15:36:11 2013 -0600
|
|
|
|
build: fix linking virt-login-shell
|
|
|
|
After commit 3e2f27e1, I've noticed build failures of virt-login-shell
|
|
when libapparmor-devel is installed on the build host
|
|
|
|
CCLD virt-login-shell
|
|
../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-vircommand.o):
|
|
In function `virExec':
|
|
/home/jfehlig/virt/upstream/libvirt/src/util/vircommand.c:653: undefined
|
|
reference to `aa_change_profile'
|
|
collect2: error: ld returned 1 exit status
|
|
|
|
I was about to commit an easy fix under the build-breaker rule
|
|
(build-fix-1.patch), but thought to extend the notion of SECDRIVER_LIBS
|
|
to SECDRIVER_CFLAGS, and use both throughout src/Makefile.am where it
|
|
makes sense (build-fix-2.patch).
|
|
|
|
Should I just stick with the simple fix, or is something along the lines
|
|
of patch 2 preferred?
|
|
|
|
Regards,
|
|
Jim
|
|
|
|
>From a0f35945f3127ab70d051101037e821b1759b4bb Mon Sep 17 00:00:00 2001
|
|
From: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Mon, 21 Oct 2013 15:30:02 -0600
|
|
Subject: [PATCH] build: fix virt-login-shell build with apparmor
|
|
|
|
With libapparmor-devel installed, virt-login-shell fails to link
|
|
|
|
CCLD virt-login-shell
|
|
../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-vircommand.o): In function `virExec':
|
|
/home/jfehlig/virt/upstream/libvirt/src/util/vircommand.c:653: undefined reference to `aa_change_profile'
|
|
collect2: error: ld returned 1 exit status
|
|
|
|
Fix by linking libvirt_setuid_rpc_client with previously determined
|
|
SECDRIVER_LIBS in src/Makefile.am. While at it, introduce SECDRIVER_CFLAGS
|
|
and use both throughout src/Makefile.am where it makes sense.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
|
|
Index: libvirt-1.1.2/src/Makefile.am
|
|
===================================================================
|
|
--- libvirt-1.1.2.orig/src/Makefile.am
|
|
+++ libvirt-1.1.2/src/Makefile.am
|
|
@@ -49,11 +49,14 @@ nodist_conf_DATA =
|
|
|
|
THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
|
|
|
|
+SECDRIVER_CFLAGS =
|
|
SECDRIVER_LIBS =
|
|
if WITH_SECDRIVER_SELINUX
|
|
+SECDRIVER_CFLAGS += $(SELINUX_CFLAGS)
|
|
SECDRIVER_LIBS += $(SELINUX_LIBS)
|
|
endif
|
|
if WITH_SECDRIVER_APPARMOR
|
|
+SECDRIVER_CFLAGS += $(APPARMOR_CFLAGS)
|
|
SECDRIVER_LIBS += $(APPARMOR_LIBS)
|
|
endif
|
|
|
|
@@ -1978,14 +1981,14 @@ libvirt_setuid_rpc_client_la_SOURCES =
|
|
libvirt_setuid_rpc_client_la_LDFLAGS = \
|
|
$(AM_LDFLAGS) \
|
|
$(LIBXML_LIBS) \
|
|
- $(SELINUX_LIBS) \
|
|
+ $(SECDRIVER_LIBS) \
|
|
$(NULL)
|
|
libvirt_setuid_rpc_client_la_CFLAGS = \
|
|
-DLIBVIRT_SETUID_RPC_CLIENT \
|
|
-I$(top_srcdir)/src/conf \
|
|
-I$(top_srcdir)/src/rpc \
|
|
$(AM_CFLAGS) \
|
|
- $(SELINUX_CFLAGS) \
|
|
+ $(SECDRIVER_CFLAGS) \
|
|
$(NULL)
|
|
endif WITH_LXC
|
|
|
|
@@ -2268,6 +2271,7 @@ libvirt_net_rpc_la_LDFLAGS = \
|
|
$(GNUTLS_LIBS) \
|
|
$(SASL_LIBS) \
|
|
$(SSH2_LIBS)\
|
|
+ $(SECDRIVER_LIBS) \
|
|
$(AM_LDFLAGS) \
|
|
$(CYGWIN_EXTRA_LDFLAGS) \
|
|
$(MINGW_EXTRA_LDFLAGS)
|
|
@@ -2410,12 +2414,7 @@ if WITH_BLKID
|
|
libvirt_lxc_CFLAGS += $(BLKID_CFLAGS)
|
|
libvirt_lxc_LDADD += $(BLKID_LIBS)
|
|
endif
|
|
-if WITH_SECDRIVER_SELINUX
|
|
-libvirt_lxc_CFLAGS += $(SELINUX_CFLAGS)
|
|
-endif
|
|
-if WITH_SECDRIVER_APPARMOR
|
|
-libvirt_lxc_CFLAGS += $(APPARMOR_CFLAGS)
|
|
-endif
|
|
+libvirt_lxc_CFLAGS += $(SECDRIVER_CFLAGS)
|
|
endif
|
|
endif
|
|
EXTRA_DIST += $(LXC_CONTROLLER_SOURCES)
|