From 2079f07a926ec0b489ab30befe0cb2bcaebc40f6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 12 Dec 2013 19:18:41 +0100 Subject: [PATCH] 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 Signed-off-by: "Yann E. MORIN" Cc: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/parted/Config.in | 1 - package/parted/parted.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/parted/Config.in b/package/parted/Config.in index 321fdf739f..45170aaaaf 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 231ab35848..afb8287f16 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 -- 2.30.2