From patchwork Sat Jan 18 12:54:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 312284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id D2FE12C007E for ; Sat, 18 Jan 2014 23:54:16 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8CE772FE3C; Sat, 18 Jan 2014 12:54:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UF5y5Rf8q2q0; Sat, 18 Jan 2014 12:54:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0D87F26D54; Sat, 18 Jan 2014 12:54:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 206F61C235E for ; Sat, 18 Jan 2014 12:54:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1BDDE87ABF for ; Sat, 18 Jan 2014 12:54:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MPRH5ADx2PBo for ; Sat, 18 Jan 2014 12:54:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from blu0-omc3-s3.blu0.hotmail.com (blu0-omc3-s3.blu0.hotmail.com [65.55.116.78]) by whitealder.osuosl.org (Postfix) with ESMTP id 29D708B2DC for ; Sat, 18 Jan 2014 12:54:10 +0000 (UTC) Received: from BLU0-SMTP111 ([65.55.116.74]) by blu0-omc3-s3.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 18 Jan 2014 04:54:09 -0800 X-TMN: [o7t3LAolF5UbQdCgEJcZNcZmxVXNLqaw] X-Originating-Email: [berndkuhls@hotmail.com] Message-ID: Received: from fli4l.lan.fli4l ([79.247.174.178]) by BLU0-SMTP111.blu0.hotmail.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 18 Jan 2014 04:54:07 -0800 Received: from fli4lbuild.lan.fli4l ([192.168.1.50]:41602) by fli4l.lan.fli4l with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1W4VPY-0006k5-Eo; Sat, 18 Jan 2014 13:54:05 +0100 From: Bernd Kuhls To: buildroot@busybox.net Date: Sat, 18 Jan 2014 13:54:02 +0100 X-Mailer: git-send-email 1.7.9.5 X-OriginalArrivalTime: 18 Jan 2014 12:54:07.0994 (UTC) FILETIME=[6021EDA0:01CF144C] MIME-Version: 1.0 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH v2 1/1] libenca: Add iconv support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This patch depends on http://patchwork.ozlabs.org/patch/311506/ --- Changes v1 -> v2: Add patch to fix AM_ICONV macro usage Signed-off-by: Bernd Kuhls --- package/libenca/Config.in | 1 + package/libenca/libenca-003-iconv.patch | 15 +++++++++++++++ package/libenca/libenca.mk | 5 +---- 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 package/libenca/libenca-003-iconv.patch diff --git a/package/libenca/Config.in b/package/libenca/Config.in index 5e951ed..58217dc 100644 --- a/package/libenca/Config.in +++ b/package/libenca/Config.in @@ -1,4 +1,5 @@ config BR2_PACKAGE_LIBENCA + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE bool "libenca" help Extremely Naive Charset Analyser diff --git a/package/libenca/libenca-003-iconv.patch b/package/libenca/libenca-003-iconv.patch new file mode 100644 index 0000000..12d57b0 --- /dev/null +++ b/package/libenca/libenca-003-iconv.patch @@ -0,0 +1,15 @@ +libiconv.m4: Fix AM_ICONV macro usage + +Signed-off-by: Bernd Kuhls + +--- a/m4/libiconv.m4 2013-09-30 09:48:22.000000000 +0200 ++++ b/m4/libiconv.m4 2014-01-18 12:56:32.634514555 +0100 +@@ -17,7 +17,7 @@ + dnl + + dnl Use standard iconv test +-AM_ICONV ++m4_pattern_allow([AM_ICONV]) + CONVERTER_LIBS="$CONVERTER_LIBS $LIBICONV" + + dnl Compile iconvcap.c and run it to determine what encodings iconv actually diff --git a/package/libenca/libenca.mk b/package/libenca/libenca.mk index e69c124..1c5c162 100644 --- a/package/libenca/libenca.mk +++ b/package/libenca/libenca.mk @@ -10,6 +10,7 @@ LIBENCA_INSTALL_STAGING = YES LIBENCA_AUTORECONF = YES LIBENCA_LICENSE = GPLv2 LIBENCA_LICENSE_FILES = COPYING +LIBENCA_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBENCA_CONF_ENV += ac_cv_file__dev_random=yes \ ac_cv_file__dev_urandom=yes \ @@ -30,7 +31,3 @@ endef LIBENCA_POST_CONFIGURE_HOOKS += LIBENCA_MAKE_HOST_TOOL $(eval $(autotools-package)) - -XERCES_CONF_OPT = --disable-threads \ - --with-gnu-ld -