From b7d0e27238458a5428da9df406630b4a3dfdd0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Wed, 21 Feb 2018 15:21:03 +0000 Subject: [PATCH] src: remove WITH_LIBVIRTD condition around hal/udev build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently building --without-libvirtd causes a failure to link the node device driver: node_device/.libs/libvirt_driver_nodedev_la-node_device_driver.o: In function `nodedevRegister': /home/berrange/src/virt/libvirt/src/node_device/node_device_driver.c:649: undefined reference to `udevNodeRegister' collect2: error: ld returned 1 exit status because it causes us to build the core nodedev driver, but then skip the implementations, despite udev being available. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/Makefile.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index db68e01db4..38fa1e3393 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1863,7 +1863,6 @@ libvirt_driver_nodedev_la_CFLAGS = \ libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) libvirt_driver_nodedev_la_LIBADD = -if WITH_LIBVIRTD if WITH_HAL libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS) @@ -1874,7 +1873,6 @@ libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS) libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS) endif WITH_UDEV -endif WITH_LIBVIRTD libvirt_driver_nodedev_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la endif WITH_NODE_DEVICES -- GitLab