summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-04-13 23:11:00 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-04-13 23:12:52 +0200
commit64281e5a91e39c67479b8cdbde535e258b968c16 (patch)
treec81d02bc5e7cdc7f9c6c348e12af687576e5615b
parentef37472b20894c99cad758397f3cd6b90f933df1 (diff)
downloadbuildroot-64281e5a91e39c67479b8cdbde535e258b968c16.tar.gz
buildroot-64281e5a91e39c67479b8cdbde535e258b968c16.zip
cannelloni: needs dynamic library
cannelloni selects lksctp which depends on !BR2_STATIC_LIBS, but this dependency was not propagated to cannelloni. Due to this, when cannelloni was selected, lksctp-tools could be built even in a BR2_STATIC_LIBS=y configuration. We fix this by propagating the dependency. While we're at it, we adjust the indentation of the cannelloni comment dependencies. Fixes: http://autobuild.buildroot.org/results/b589af984499c532951217eb500ff31e6655c63f/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/cannelloni/Config.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/cannelloni/Config.in b/package/cannelloni/Config.in
index cb51709fa4..8f3e888308 100644
--- a/package/cannelloni/Config.in
+++ b/package/cannelloni/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_CANNELLONI
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # lksctp-tools
depends on BR2_TOOLCHAIN_HAS_THREADS # lksctp-tools
+ depends on !BR2_STATIC_LIBS # lksctp-tools
select BR2_PACKAGE_LKSCTP_TOOLS
help
A SocketCAN over Ethernet tunnel. The tunnel supports both
@@ -11,7 +12,7 @@ config BR2_PACKAGE_CANNELLONI
https://github.com/mguentner/cannelloni
-comment "cannelloni needs a toolchain w/ C++, threads, gcc >= 4.8"
- depends on !BR2_INSTALL_LIBSTDCPP || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS
+comment "cannelloni needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8"
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU
OpenPOWER on IntegriCloud