From patchwork Fri Dec 14 19:15:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 206549 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 037E32C0089 for ; Sat, 15 Dec 2012 06:15:33 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3F935A0320; Fri, 14 Dec 2012 19:15:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RKak8SVI5Foi; Fri, 14 Dec 2012 19:15:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 56CFCA0021; Fri, 14 Dec 2012 19:15:29 +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 DF6168F74B for ; Fri, 14 Dec 2012 19:15:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 52CE38CAAD for ; Fri, 14 Dec 2012 19:15:28 +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 o-Q63aPW7bQ6 for ; Fri, 14 Dec 2012 19:15:26 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8F0328CA7E for ; Fri, 14 Dec 2012 19:15:26 +0000 (UTC) Received: from asgard (host102.190-31-2.telecom.net.ar [190.31.2.102]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id qBEJFIem010450 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 14 Dec 2012 19:15:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1355512523; bh=P3GIaBD4fpo2YDwN1FZWi0gSm6eotvE5MbIHfrm5En0=; h=From:To:Cc:Subject:Date; b=fIBdw7ExZm7ddqROSVUTAyJQ1scAow7pvv61WqkyyQA6QseiQkzzloZcfckUXfN1U y9hzUwIcuwVt7zu42rlB6YzcX9xJwmEC0XzuAsXNvCau2LMTZQNBskf1il8y5yohVw El3aDfiz8XPRcb6G7rCod5A/9LLyH5UX5W2QcEkY= Received: by asgard (sSMTP sendmail emulation); Fri, 14 Dec 2012 16:15:17 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Fri, 14 Dec 2012 16:15:17 -0300 Message-Id: <1355512517-24342-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] gettext: fix build failure with locale and uclibc 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net As reported by Johan Sagaert in the mailing list, if it's building with a uClibc toolchain with locale enabled the build fails since the new gettext does a locale hack for glibc which isn't needed nor supported. Signed-off-by: Gustavo Zacarias --- package/gettext/gettext-uclibc-compat.patch | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 package/gettext/gettext-uclibc-compat.patch diff --git a/package/gettext/gettext-uclibc-compat.patch b/package/gettext/gettext-uclibc-compat.patch new file mode 100644 index 0000000..5e52665 --- /dev/null +++ b/package/gettext/gettext-uclibc-compat.patch @@ -0,0 +1,27 @@ +The glibc fix/hack isn't valid for uClibc. +Patch taken from OpenWRT. + +Signed-off-by: Gustavo Zacarias + +--- a/gettext-runtime/intl/localename.c ++++ b/gettext-runtime/intl/localename.c +@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego + locale_t thread_locale = uselocale (NULL); + if (thread_locale != LC_GLOBAL_LOCALE) + { +-# if __GLIBC__ >= 2 ++# if __GLIBC__ >= 2 && !defined __UCLIBC__ + /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in + glibc < 2.12. + See . */ +--- a/gettext-tools/gnulib-lib/localename.c ++++ b/gettext-tools/gnulib-lib/localename.c +@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego + locale_t thread_locale = uselocale (NULL); + if (thread_locale != LC_GLOBAL_LOCALE) + { +-# if __GLIBC__ >= 2 ++# if __GLIBC__ >= 2 && !defined __UCLIBC__ + /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in + glibc < 2.12. + See . */