diff mbox

[v2] cannelloni: make SCTP support optional

Message ID 1460974018-29267-1-git-send-email-yegorslists@googlemail.com
State Accepted
Headers show

Commit Message

Yegor Yefremov April 18, 2016, 10:06 a.m. UTC 
From: Yegor Yefremov <yegorslists@googlemail.com>

Since version 20160414 SCTP support is optional. Introduce an automatic
optional dependency for this protocol.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
Changes:
	v2: change selectable option to automatic optional dependency (Thomas Petazzoni)

 package/cannelloni/Config.in     | 1 -
 package/cannelloni/cannelloni.mk | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni April 18, 2016, 11:35 a.m. UTC | #1 
Hello,

On Mon, 18 Apr 2016 12:06:58 +0200, yegorslists@googlemail.com wrote:

> +ifeq ($(BR2_PACKAGE_LKSCTP_TOOLS),y)
> +CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=ON
>  CANNELLONI_DEPENDENCIES = lksctp-tools

Now that this dependency is conditional, I've changed this = to += to
avoid possible mistakes in the future.

Applied, thanks!

Thomas
diff mbox

Patch

diff --git a/package/cannelloni/Config.in b/package/cannelloni/Config.in
index 8f3e888..e137e60 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 680e09a..7265945 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
+
+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))