[Buildroot] [git commit] package/neardal: unconditionally use libedit

Yann E. MORIN yann.morin.1998 at free.fr
Thu Nov 14 21:52:46 UTC 2019


commit: https://git.buildroot.net/buildroot/commit/?id=93e9b5378d8ed6c67caf0aa9aca18b65d0ce0b45
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

neardal is licensed under LGPL-2.0, which is (most likely) not license
compatible with readline (GPL-3.0+), so always use the libedit backend.

The choice is done by ./configure, which first checks for libedit, and
uses readline only as a fallback. Since we do build libedit before
neardal, that's what is going to be picked up.

Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
[yann.morin.1998 at free.fr:
  - add blurb about preference in ./configure
]
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
---
 package/neardal/Config.in  |  2 +-
 package/neardal/neardal.mk | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/package/neardal/Config.in b/package/neardal/Config.in
index c729283380..5f33ae4953 100644
--- a/package/neardal/Config.in
+++ b/package/neardal/Config.in
@@ -5,7 +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
+	select BR2_PACKAGE_LIBEDIT
 	help
 	  Provides a simple C API to exchange data with the neard NFC
 	  manager daemon.
diff --git a/package/neardal/neardal.mk b/package/neardal/neardal.mk
index b56ce3b3a3..28e2850e30 100644
--- a/package/neardal/neardal.mk
+++ b/package/neardal/neardal.mk
@@ -10,17 +10,9 @@ NEARDAL_INSTALL_STAGING = YES
 NEARDAL_LICENSE = LGPL-2.0
 NEARDAL_LICENSE_FILES = COPYING
 
-NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib
+NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib libedit
 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


More information about the buildroot mailing list