Selaa lähdekoodia

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>
Thomas Petazzoni 9 vuotta sitten
vanhempi
commit
64281e5a91
1 muutettua tiedostoa jossa 4 lisäystä ja 3 poistoa
  1. 4 3
      package/cannelloni/Config.in

+ 4 - 3
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