diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2019-03-17 21:09:46 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2019-03-27 15:31:41 +0100 |
| commit | f20b18f66afb081fe8ec01b4741668edb91b845f (patch) | |
| tree | af8bf14b6892c29c225131b24416059353897ff9 | |
| parent | d56572e447fb84730cad43dd50684b6f85a2bd72 (diff) | |
| download | buildroot-f20b18f66afb081fe8ec01b4741668edb91b845f.tar.gz buildroot-f20b18f66afb081fe8ec01b4741668edb91b845f.zip | |
package/libpcap: fix bluez circular dependency
The optional bluez_utils dependency of libpcap creates a circular
dependency:
$ make dbus-show-recursive-depends
Recursion detected for : systemd
which is a dependency of: dbus
which is a dependency of: bluez_utils
which is a dependency of: libpcap
which is a dependency of: iptables
which is a dependency of: systemd
make: *** [package/dbus/dbus.mk:121: dbus-show-recursive-depends] Error 1
Drop support for bluez_utils. For bluez5_utils, which also depends on
dbus, we only need the headers in the bluez5_utils-headers package. Use
that to break the circular dependency.
Fixes:
http://autobuild.buildroot.net/results/9c3/9c3ee798fa6bb501a20a7892c0b085d2b279b664/
Suggested-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit c46afc37dc877f1e94ffde0d77585290711b27ec)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/libpcap/libpcap.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 83188c8c48..2f46426d37 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -26,10 +26,8 @@ define LIBPCAP_CONFIG_REMOVE_RPATH endef LIBPCAP_POST_BUILD_HOOKS = LIBPCAP_CONFIG_REMOVE_RPATH -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -LIBPCAP_DEPENDENCIES += bluez_utils -else ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) -LIBPCAP_DEPENDENCIES += bluez5_utils +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) +LIBPCAP_DEPENDENCIES += bluez5_utils-headers else LIBPCAP_CONF_OPTS += --disable-bluetooth endif |
