38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
|
commit a6f05b5fdf139aa7155b64b2b581ff88151fbfca
|
||
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
||
|
|
Date: Mon Oct 21 14:57:27 2013 -0600
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
Index: libvirt-1.1.2/src/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-1.1.2.orig/src/Makefile.am
|
||
|
|
+++ libvirt-1.1.2/src/Makefile.am
|
||
|
|
@@ -1978,7 +1978,7 @@ 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 \
|
||
|
|
@@ -1986,6 +1986,7 @@ libvirt_setuid_rpc_client_la_CFLAGS = \
|
||
|
|
-I$(top_srcdir)/src/rpc \
|
||
|
|
$(AM_CFLAGS) \
|
||
|
|
$(SELINUX_CFLAGS) \
|
||
|
|
+ $(APPARMOR_CFLAGS) \
|
||
|
|
$(NULL)
|
||
|
|
endif WITH_LXC
|
||
|
|
|