package/libpcap: disable dbus to break circular dependency

The optional dbus dependency of libpcap creates a circular dependency
chain:

$ make libpcap-show-recursive-depends

Recursion detected for  : systemd
which is a dependency of: dbus
which is a dependency of: libpcap
which is a dependency of: iptables
which is a dependency of: systemd
make: *** [package/libpcap/libpcap.mk:55: libpcap-show-recursive-depends] Error 1

Of all these dependencies the one of libpcap on dbus seems to be less
useful. Drop it.

Fixes:
http://autobuild.buildroot.net/results/0b5d18bff816cbcee11e8645449701722d956de5/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Baruch Siach 2019-03-09 20:28:14 +02:00 committed by Thomas Petazzoni
parent 2776484107
commit b01d463c14

View File

@ -16,6 +16,8 @@ LIBPCAP_CONF_ENV = \
CFLAGS="$(LIBPCAP_CFLAGS)" CFLAGS="$(LIBPCAP_CFLAGS)"
LIBPCAP_CFLAGS = $(TARGET_CFLAGS) LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag
# Disable dbus to break recursive dependencies
LIBPCAP_CONF_OPTS += --disable-dbus
LIBPCAP_CONFIG_SCRIPTS = pcap-config LIBPCAP_CONFIG_SCRIPTS = pcap-config
# Omit -rpath from pcap-config output # Omit -rpath from pcap-config output
@ -32,13 +34,6 @@ else
LIBPCAP_CONF_OPTS += --disable-bluetooth LIBPCAP_CONF_OPTS += --disable-bluetooth
endif endif
ifeq ($(BR2_PACKAGE_DBUS),y)
LIBPCAP_CONF_OPTS += --enable-dbus
LIBPCAP_DEPENDENCIES += dbus
else
LIBPCAP_CONF_OPTS += --disable-dbus
endif
ifeq ($(BR2_PACKAGE_LIBNL),y) ifeq ($(BR2_PACKAGE_LIBNL),y)
LIBPCAP_DEPENDENCIES += libnl LIBPCAP_DEPENDENCIES += libnl
LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3" LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3"