From 5462d77d2b092b3c63e182e1d467cd196d32d557 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 16 Jan 2012 12:34:55 +0100 Subject: [PATCH] grep: make build with libiconv optional Signed-off-by: Stephan Raue --- packages/sysutils/grep/build | 4 +++- packages/sysutils/grep/meta | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/grep/build b/packages/sysutils/grep/build index 1165217f0e..c6e90d668e 100755 --- a/packages/sysutils/grep/build +++ b/packages/sysutils/grep/build @@ -22,7 +22,9 @@ . config/options $1 -export LIBS="-liconv" +if [ "$ICONV" = "libiconv" ]; then + export LIBS="-liconv" +fi cd $PKG_BUILD ./configure --host=$TARGET_NAME \ diff --git a/packages/sysutils/grep/meta b/packages/sysutils/grep/meta index d0e9a3940c..3fc5453f48 100644 --- a/packages/sysutils/grep/meta +++ b/packages/sysutils/grep/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/grep/" PKG_URL="ftp://sunsite.cnlab-switch.ch/mirror/gnu/grep/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="libiconv pcre" -PKG_BUILD_DEPENDS="toolchain libiconv pcre" +PKG_DEPENDS="$ICONV pcre" +PKG_BUILD_DEPENDS="toolchain $ICONV pcre" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="grep: This is GNU grep, the fastest grep in the west"