package/parted: relax dependency on readline

parted can be configured without support for readline (ie. can be
not interactive), so we can relax the dependency on readline, and
make it an optional feature.

(Based on a code-snippet from Thomas.)

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/parted/Config.in b/package/parted/Config.in
index 321fdf739fcc50ed25c6b6e6ef131e8cd90a686b..45170aaaaf032c23c97818d5f5a971d4bf2def4c 100644 (file)
--- a/package/parted/Config.in
+++ b/package/parted/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_PARTED
        bool "parted"
        depends on BR2_LARGEFILE
        depends on BR2_USE_WCHAR
-       select BR2_PACKAGE_READLINE
        select BR2_PACKAGE_UTIL_LINUX
        select BR2_PACKAGE_UTIL_LINUX_LIBUUID
        help

diff --git a/package/parted/parted.mk b/package/parted/parted.mk
index 231ab35848d0d5aa64f14fd0517a3c4636758d99..afb8287f1686f8bd1788e7b9a6a6e3d3de151f48 100644 (file)
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -7,11 +7,18 @@
 PARTED_VERSION = 3.1
 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
 PARTED_SITE = $(BR2_GNU_MIRROR)/parted
-PARTED_DEPENDENCIES = readline util-linux
+PARTED_DEPENDENCIES = util-linux
 PARTED_INSTALL_STAGING = YES
 PARTED_LICENSE = GPLv3+
 PARTED_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_READLINE),y)
+PARTED_DEPENDENCIES += readline
+PARTED_CONF_OPT += --with-readline
+else
+PARTED_CONF_OPT += --without-readline
+endif
+
 ifeq ($(BR2_PACKAGE_LVM2),y)
 PARTED_DEPENDENCIES += lvm2
 PARTED_CONF_OPT += --enable-device-mapper