neardal: bump version
authorMaxime Hadjinlian <maxime.hadjinlian@gmail.com>
Sun, 26 Oct 2014 18:45:52 +0000 (19:45 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 1 Feb 2015 21:19:28 +0000 (22:19 +0100)
[Thomas: add dependency on either readline or libedit, which is needed
for new versions of neardal.]

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/neardal/Config.in
package/neardal/neardal.mk

index 0e871716f71ff173800fe77217a12cc9e85de343..c7292833800032614593c3237a058b31c49e0110 100644 (file)
@@ -5,6 +5,7 @@ config BR2_PACKAGE_NEARDAL
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_GLIB
+       select BR2_PACKAGE_READLINE if !BR2_PACKAGE_LIBEDIT
        help
          Provides a simple C API to exchange data with the neard NFC
          manager daemon.
index 0720fe8919d997f925b56ddc06a3d89ffe9bacca..cbbc6287ccc1f64bcb34b24f4252b0e5367bfc78 100644 (file)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NEARDAL_VERSION = da8e06d3884d214bb19b894d2b8fdc9c7ca8575f
+NEARDAL_VERSION = 33b54a55032b047fd885a5eb3592c169c0056c49
 NEARDAL_SITE = $(call github,connectivity,neardal,$(NEARDAL_VERSION))
 NEARDAL_INSTALL_STAGING = YES
 NEARDAL_LICENSE = GPLv2
@@ -13,6 +13,14 @@ NEARDAL_LICENSE_FILES = COPYING
 NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib
 NEARDAL_AUTORECONF = YES
 
+# Either readline or libedit are needed, and the Config.in file
+# guarantees at least one of them is enabled
+ifeq ($(BR2_PACKAGE_READLINE),y)
+NEARDAL_DEPENDENCIES += readline
+else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+NEARDAL_DEPENDENCIES += libedit
+endif
+
 define NEARDAL_INSTALL_NCL
        $(INSTALL) -m 0755 -D $(@D)/ncl/ncl $(TARGET_DIR)/usr/bin/ncl
 endef