From 134912e2ccea8391b28558acc0a50850699be948 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 16 Jan 2012 12:34:44 +0100 Subject: [PATCH] enca: make build with libiconv optional Signed-off-by: Stephan Raue --- packages/other/enca/build | 7 +++++-- packages/other/enca/meta | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/other/enca/build b/packages/other/enca/build index 844b2aa275..9591d8fb68 100755 --- a/packages/other/enca/build +++ b/packages/other/enca/build @@ -22,7 +22,10 @@ . config/options $1 -export LDFLAGS="$LDFLAGS -liconv" +if [ "$ICONV" = "libiconv" ]; then + CONFIG_ENCA="--with-libiconv-prefix=$SYSROOT_PREFIX/usr" + export LDFLAGS="$LDFLAGS -liconv" +fi cd $PKG_BUILD ac_cv_file__dev_random=yes \ @@ -39,7 +42,7 @@ CPPFLAGS="-I$SYSROOT_PREFIX/usr/include" \ --enable-shared \ --disable-static \ --disable-external \ - --with-libiconv-prefix="$SYSROOT_PREFIX/usr" \ + $CONFIG_ENCA \ --without-librecode \ --disable-rpath \ --with-gnu-ld diff --git a/packages/other/enca/meta b/packages/other/enca/meta index d0a338b6fd..f5f685122c 100644 --- a/packages/other/enca/meta +++ b/packages/other/enca/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://freshmeat.net/projects/enca/" PKG_URL="http://dl.cihar.com/enca/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libiconv" -PKG_BUILD_DEPENDS="toolchain libiconv" +PKG_DEPENDS="$ICONV" +PKG_BUILD_DEPENDS="toolchain $ICONV" PKG_PRIORITY="optional" PKG_SECTION="other" PKG_SHORTDESC="enca: detects the encoding of text files, on the basis of knowledge of their language."