projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1e4da9c)
package/libpcap: fix bluez5_utils-headers dependency
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Mon, 18 Mar 2019 22:40:42 +0000 (23:40 +0100)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Tue, 19 Mar 2019 21:31:09 +0000 (22:31 +0100)
Commit c46afc37dc877f1e94ffde0d77585290711b27ec changed bluez5-utils
dependency by bluez5_utils-headers without replacing the test on
BR2_PACKAGE_BLUEZ5_UTILS by BR2_PACKAGE_BLUEZ5_UTILS_HEADERS

Fix this mistake and also add a select on
BR2_PACKAGE_BLUEZ5_UTILS_HEADERS if BR2_PACKAGE_BLUEZ5_UTILS is set
so the user does not have to do it

Fixes:
 - http://autobuild.buildroot.org/results/c6828df1f3782564451ddd4187ff026679bf37d8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/libpcap/Config.in patch | blob | history
package/libpcap/libpcap.mk patch | blob | history

diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in
index 643acbef6eb7640b1dd8787d114ab0860f8cab45..74429f209af9243eb21b9d8fec6ce8aad3ba5418 100644 (file)
--- a/package/libpcap/Config.in
+++ b/package/libpcap/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBPCAP
        bool "libpcap"
+       select BR2_PACKAGE_BLUEZ5_UTILS_HEADERS if BR2_PACKAGE_BLUEZ5_UTILS
        select BR2_PACKAGE_ZLIB
        help
          A system-independent library for user-level network packet
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 2f46426d3756985239b40d77390ccfc89de1440f..ebceca527387e06d84c1c4a827da652eef79951e 100644 (file)
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -26,7 +26,7 @@ define LIBPCAP_CONFIG_REMOVE_RPATH
 endef
 LIBPCAP_POST_BUILD_HOOKS = LIBPCAP_CONFIG_REMOVE_RPATH
 
-ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),y)
 LIBPCAP_DEPENDENCIES += bluez5_utils-headers
 else
 LIBPCAP_CONF_OPTS += --disable-bluetooth