summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlias Apalodimas <apalos@gmail.com>2017-05-27 15:47:47 +0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-05-27 17:10:21 +0200
commitd01b0bbad04b97a5e8e1dd3ac3c1026555f793fb (patch)
treec54181fd7b8f240204723e5747715e1a93da1f1e
parent9b853b784452d7a701cc3c823b92a825d962647a (diff)
downloadbuildroot-d01b0bbad04b97a5e8e1dd3ac3c1026555f793fb.tar.gz
buildroot-d01b0bbad04b97a5e8e1dd3ac3c1026555f793fb.zip
keepalived: needs headers >= 3.4
keepalived fails to build on toolchains with headers older than 3.4, because of a namespace clash between the xt_set.h header from the kernel and the linux_ip_set.h header installed by ipset. Even though keepalived does check for pre-3.4 headers, the check somehow fails to work correctly. We fix that by making keepalived depend on headers 3.4 or later. Fixes: http://autobuild.buildroot.org/results/770/770d8fd2f3bacbdbe233da1b4d6e64e20a84d5a5/ http://autobuild.buildroot.org/results/1ad/1adb710b915427f681eae37452a0942833ce533e/ http://autobuild.buildroot.org/results/70b/70b31547e51ec7213372d2ef07bec34c5df77560/ [...] Signed-off-by: Ilias Apalodimas <apalos@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/keepalived/Config.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/keepalived/Config.in b/package/keepalived/Config.in
index efa745ad9e..0140e62ae2 100644
--- a/package/keepalived/Config.in
+++ b/package/keepalived/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_KEEPALIVED
bool "keepalived"
depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS # uses libdl
+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_POPT
help
@@ -15,6 +16,6 @@ config BR2_PACKAGE_KEEPALIVED
http://www.keepalived.org/
-comment "keepalived needs a toolchain w/ dynamic library"
+comment "keepalived needs a toolchain w/ dynamic library, headers >= 3.4"
depends on BR2_USE_MMU
- depends on BR2_STATIC_LIBS
+ depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
OpenPOWER on IntegriCloud