Patchwork socketcand: bump to version 0.3.1

login
register
mail settings
Submitter gilles.talis@gmail.com
Date June 18, 2013, 9:22 p.m.
Message ID <1371590554-12702-1-git-send-email-gilles.talis@gmail.com>
Download mbox | patch
Permalink /patch/252448/
State Accepted
Commit 53e498da2f2ebfc87c3de0fe18bc9132e94b4fcb
Headers show

Comments

gilles.talis@gmail.com - June 18, 2013, 9:22 p.m.
Since version 0.3.0, libconfig has been made optional

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
---
 package/socketcand/Config.in     |    1 -
 package/socketcand/socketcand.mk |    7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
Peter Korsgaard - June 19, 2013, 6:30 p.m.
>>>>> "Gilles" == Gilles Talis <gilles.talis@gmail.com> writes:

 Gilles> Since version 0.3.0, libconfig has been made optional
 Gilles> Signed-off-by: Gilles Talis <gilles.talis@gmail.com>

Committed, thanks.

Patch

diff --git a/package/socketcand/Config.in b/package/socketcand/Config.in
index d5d02de..72315c0 100644
--- a/package/socketcand/Config.in
+++ b/package/socketcand/Config.in
@@ -1,6 +1,5 @@ 
 config BR2_PACKAGE_SOCKETCAND
 	bool "socketcand"
-	select BR2_PACKAGE_LIBCONFIG
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Socketcand is a daemon that provides access to CAN interfaces
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index d85eb1a..8e42698 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -4,9 +4,14 @@ 
 #
 ################################################################################
 
-SOCKETCAND_VERSION = 7d06986
+SOCKETCAND_VERSION = dc3437ab
 SOCKETCAND_SITE = http://github.com/dschanoeh/socketcand/tarball/$(SOCKETCAND_VERSION)
 SOCKETCAND_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
 SOCKETCAND_DEPENDENCIES = libconfig
+else
+SOCKETCAND_CONF_OPT = --without-config
+endif
 
 $(eval $(autotools-package))