mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
build: link libvirt_lxc against libvirt.so
Rather than static linking in various of the helper libraries to libvirt_lxc, just link against the main libvirt.so. This is more memory and time efficient because it will already be cached in memory and sharable between processes. CAPNG flags need adding because the LXC code directly calls various libcapng APIs and no longer inherits the CAPNG flags via the statically linked .a libs. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
c3b24e7051
commit
5cbe0b1085
@ -3113,14 +3113,12 @@ libvirt_lxc_SOURCES = \
|
|||||||
libvirt_lxc_LDFLAGS = \
|
libvirt_lxc_LDFLAGS = \
|
||||||
$(AM_LDFLAGS) \
|
$(AM_LDFLAGS) \
|
||||||
$(PIE_LDFLAGS) \
|
$(PIE_LDFLAGS) \
|
||||||
|
$(CAPNG_LIBS) \
|
||||||
|
$(LIBXML_LIBS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
libvirt_lxc_LDADD = \
|
libvirt_lxc_LDADD = \
|
||||||
$(FUSE_LIBS) \
|
$(FUSE_LIBS) \
|
||||||
libvirt-net-rpc-server.la \
|
libvirt.la \
|
||||||
libvirt-net-rpc.la \
|
|
||||||
libvirt_security_manager.la \
|
|
||||||
libvirt_conf.la \
|
|
||||||
libvirt_util.la \
|
|
||||||
../gnulib/lib/libgnu.la
|
../gnulib/lib/libgnu.la
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
libvirt_lxc_LDADD += libvirt_probes.lo
|
libvirt_lxc_LDADD += libvirt_probes.lo
|
||||||
@ -3130,6 +3128,8 @@ libvirt_lxc_CFLAGS = \
|
|||||||
-I$(srcdir)/conf \
|
-I$(srcdir)/conf \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
$(PIE_CFLAGS) \
|
$(PIE_CFLAGS) \
|
||||||
|
$(CAPNG_CFLAGS) \
|
||||||
|
$(LIBXML_CFLAGS) \
|
||||||
$(LIBNL_CFLAGS) \
|
$(LIBNL_CFLAGS) \
|
||||||
$(FUSE_CFLAGS) \
|
$(FUSE_CFLAGS) \
|
||||||
$(DBUS_CFLAGS) \
|
$(DBUS_CFLAGS) \
|
||||||
|
@ -347,6 +347,7 @@ virDomainDiskSetSource;
|
|||||||
virDomainDiskSetType;
|
virDomainDiskSetType;
|
||||||
virDomainFSDefFree;
|
virDomainFSDefFree;
|
||||||
virDomainFSDefNew;
|
virDomainFSDefNew;
|
||||||
|
virDomainFSDriverTypeToString;
|
||||||
virDomainFSIndexByName;
|
virDomainFSIndexByName;
|
||||||
virDomainFSInsert;
|
virDomainFSInsert;
|
||||||
virDomainFSRemove;
|
virDomainFSRemove;
|
||||||
@ -470,6 +471,7 @@ virDomainObjGetOneDefState;
|
|||||||
virDomainObjGetPersistentDef;
|
virDomainObjGetPersistentDef;
|
||||||
virDomainObjGetState;
|
virDomainObjGetState;
|
||||||
virDomainObjNew;
|
virDomainObjNew;
|
||||||
|
virDomainObjParseFile;
|
||||||
virDomainObjParseNode;
|
virDomainObjParseNode;
|
||||||
virDomainObjRemoveTransientDef;
|
virDomainObjRemoveTransientDef;
|
||||||
virDomainObjSetDefTransient;
|
virDomainObjSetDefTransient;
|
||||||
|
Loading…
Reference in New Issue
Block a user