cannelloni: needs dynamic library
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 13 Apr 2016 21:11:00 +0000 (23:11 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 13 Apr 2016 21:12:52 +0000 (23:12 +0200)
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>
package/cannelloni/Config.in

index cb51709fa40b40042ce3781ae0667ac6f33c2f9d..8f3e88830870bdf32167798d0291755f864e741d 100644 (file)
@@ -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