From 85f2e13c637bbc05a428436ef000b5531505b756 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 18 Apr 2016 12:06:58 +0200 Subject: [PATCH] cannelloni: make SCTP support optional Since version 20160414 SCTP support is optional. Introduce an automatic optional dependency for this protocol. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/cannelloni/Config.in | 1 - package/cannelloni/cannelloni.mk | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/cannelloni/Config.in b/package/cannelloni/Config.in index 8f3e888308..e137e60c60 100644 --- a/package/cannelloni/Config.in +++ b/package/cannelloni/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_CANNELLONI 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 UDP and SCTP protocols. diff --git a/package/cannelloni/cannelloni.mk b/package/cannelloni/cannelloni.mk index 680e09a006..fffdb4ba9a 100644 --- a/package/cannelloni/cannelloni.mk +++ b/package/cannelloni/cannelloni.mk @@ -8,6 +8,12 @@ CANNELLONI_VERSION = 20160414 CANNELLONI_SITE = $(call github,mguentner,cannelloni,$(CANNELLONI_VERSION)) CANNELLONI_LICENSE = GPLv2 CANNELLONI_LICENSE_FILES = gpl-2.0.txt -CANNELLONI_DEPENDENCIES = lksctp-tools + +ifeq ($(BR2_PACKAGE_LKSCTP_TOOLS),y) +CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=ON +CANNELLONI_DEPENDENCIES += lksctp-tools +else +CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=OFF +endif $(eval $(cmake-package)) -- 2.30.2