summaryrefslogtreecommitdiff
path: root/package/parted
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2013-12-12 19:18:41 +0100
committerPeter Korsgaard <peter@korsgaard.com>2013-12-12 23:58:27 +0100
commit2079f07a926ec0b489ab30befe0cb2bcaebc40f6 (patch)
treeceacafeecc4eb4199689516bf68d72412d056804 /package/parted
parentb1f2cbb40950a73741dfa578f43f2a5e88cdd953 (diff)
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>
Diffstat (limited to 'package/parted')
-rw-r--r--package/parted/Config.in1
-rw-r--r--package/parted/parted.mk9
2 files changed, 8 insertions, 2 deletions
diff --git a/package/parted/Config.in b/package/parted/Config.in
index 321fdf739..45170aaaa 100644
--- 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 231ab3584..afb8287f1 100644
--- 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