External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure libvirt is linked first

Browse Source 
so it's not affected by flags that might be passed in $(*_LIBS) like
-L/usr/lib which might result in linking against system library and
requiring incorrect version of private symbols

Signed-off-by: Jan Palus <atler@pld-linux.org>
This commit is contained in:
Jan Palus 2018-03-05 16:39:48 +01:00 committed by Daniel P. Berrangé
parent 11819aee65
commit 43523d7421
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Makefile.am
View File

@ -1153,6 +1153,9 @@ libvirtd_LDFLAGS = \
$(NULL)
libvirtd_LDADD = \
libvirt-lxc.la \
libvirt-qemu.la \
libvirt.la \
$(LIBXML_LIBS) \
$(GNUTLS_LIBS) \
$(SASL_LIBS) \
@ -1166,9 +1169,6 @@ endif WITH_DTRACE_PROBES
libvirtd_LDADD += \
libvirt_driver_admin.la \
libvirt-lxc.la \
libvirt-qemu.la \
libvirt.la \
../gnulib/lib/libgnu.la $(LIBSOCKET) \
$(NULL)
@ -1222,7 +1222,7 @@ libvirt_driver_interface_la_CFLAGS = \
-I$(srcdir)/conf \
$(AM_CFLAGS) $(LIBNL_CFLAGS)
libvirt_driver_interface_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
libvirt_driver_interface_la_LIBADD =
libvirt_driver_interface_la_LIBADD = libvirt.la
if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
@ -1231,7 +1231,7 @@ if WITH_UDEV
libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
endif WITH_UDEV
libvirt_driver_interface_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES)
endif WITH_INTERFACE
@ -1323,7 +1323,7 @@ endif WITH_STORAGE_SCSI
if WITH_STORAGE_MPATH
libvirt_storage_backend_mpath_la_SOURCES = \
$(STORAGE_DRIVER_MPATH_SOURCES)
libvirt_storage_backend_mpath_la_LIBADD = $(DEVMAPPER_LIBS)
libvirt_storage_backend_mpath_la_LIBADD = libvirt.la $(DEVMAPPER_LIBS)
libvirt_storage_backend_mpath_la_CFLAGS = \
-I$(srcdir)/conf \
$(DEVMAPPER_CFLAGS) \
@ -1331,7 +1331,7 @@ libvirt_storage_backend_mpath_la_CFLAGS = \
storagebackend_LTLIBRARIES += libvirt_storage_backend_mpath.la
libvirt_storage_backend_mpath_la_LDFLAGS = $(AM_LDFLAGS_MOD)
libvirt_storage_backend_mpath_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
libvirt_storage_backend_mpath_la_LIBADD += ../gnulib/lib/libgnu.la
endif WITH_STORAGE_MPATH
if WITH_STORAGE_DISK
@ -1347,7 +1347,7 @@ endif WITH_STORAGE_DISK
if WITH_STORAGE_RBD
libvirt_storage_backend_rbd_la_SOURCES = $(STORAGE_DRIVER_RBD_SOURCES)
libvirt_storage_backend_rbd_la_LIBADD = $(LIBRBD_LIBS)
libvirt_storage_backend_rbd_la_LIBADD = libvirt.la $(LIBRBD_LIBS)
libvirt_storage_backend_rbd_la_CFLAGS = \
-I$(srcdir)/conf \
-I$(srcdir)/secret \
@ -1355,7 +1355,7 @@ libvirt_storage_backend_rbd_la_CFLAGS = \
storagebackend_LTLIBRARIES += libvirt_storage_backend_rbd.la
libvirt_storage_backend_rbd_la_LDFLAGS = $(AM_LDFLAGS_MOD)
libvirt_storage_backend_rbd_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
libvirt_storage_backend_rbd_la_LIBADD += ../gnulib/lib/libgnu.la
endif WITH_STORAGE_RBD
if WITH_STORAGE_SHEEPDOG
@ -1380,7 +1380,7 @@ endif WITH_STORAGE_SHEEPDOG
if WITH_STORAGE_GLUSTER
libvirt_storage_backend_gluster_la_SOURCES = \
$(STORAGE_DRIVER_GLUSTER_SOURCES)
libvirt_storage_backend_gluster_la_LIBADD = $(GLUSTERFS_LIBS)
libvirt_storage_backend_gluster_la_LIBADD = libvirt.la $(GLUSTERFS_LIBS)
libvirt_storage_backend_gluster_la_CFLAGS = \
-I$(srcdir)/conf \
$(GLUSTERFS_CFLAGS) \
@ -1388,7 +1388,7 @@ libvirt_storage_backend_gluster_la_CFLAGS = \
storagebackend_LTLIBRARIES += libvirt_storage_backend_gluster.la
libvirt_storage_backend_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD)
libvirt_storage_backend_gluster_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
libvirt_storage_backend_gluster_la_LIBADD += ../gnulib/lib/libgnu.la
endif WITH_STORAGE_GLUSTER
if WITH_STORAGE_ZFS
@ -1424,7 +1424,7 @@ libvirt_driver_nodedev_la_CFLAGS = \
-I$(srcdir)/conf \
$(AM_CFLAGS) $(LIBNL_CFLAGS)
libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
libvirt_driver_nodedev_la_LIBADD =
libvirt_driver_nodedev_la_LIBADD = libvirt.la
if WITH_HAL
libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
@ -1437,7 +1437,7 @@ libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS)
libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS)
endif WITH_UDEV
libvirt_driver_nodedev_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
libvirt_driver_nodedev_la_LIBADD += ../gnulib/lib/libgnu.la
endif WITH_NODE_DEVICES
@ -1456,10 +1456,11 @@ libvirt_driver_nwfilter_impl_la_CFLAGS = \
$(AM_CFLAGS)
libvirt_driver_nwfilter_impl_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_driver_nwfilter_impl_la_LIBADD = \
libvirt.la \
$(LIBPCAP_LIBS) \
$(LIBNL_LIBS) \
$(DBUS_LIBS)
libvirt_driver_nwfilter_impl_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
libvirt_driver_nwfilter_impl_la_LIBADD += ../gnulib/lib/libgnu.la
libvirt_driver_nwfilter_impl_la_SOURCES = $(NWFILTER_DRIVER_SOURCES)
endif WITH_NWFILTER

2
src/lxc/Makefile.inc.am
View File

@ -121,8 +121,8 @@ libvirt_lxc_LDFLAGS = \
$(LIBXML_LIBS) \
$(NULL)
libvirt_lxc_LDADD = \
$(FUSE_LIBS) \
libvirt.la \
$(FUSE_LIBS) \
../gnulib/lib/libgnu.la \
$(NULL)
if WITH_DTRACE_PROBES

2
tools/Makefile.am
View File

@ -139,9 +139,9 @@ libvirt_shell_la_LDFLAGS = \
$(COVERAGE_LDFLAGS) \
$(NULL)
libvirt_shell_la_LIBADD = \
../src/libvirt.la \
$(LIBXML_LIBS) \
$(READLINE_LIBS) \
../src/libvirt.la \
../gnulib/lib/libgnu.la \
$(NULL)
libvirt_shell_la_SOURCES = vsh.c vsh.h