From patchwork Wed Dec 10 12:41:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 419632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 0996C1400F1 for ; Wed, 10 Dec 2014 23:41:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 19D9FA1CFD; Wed, 10 Dec 2014 12:41:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vV6vKJI9C-68; Wed, 10 Dec 2014 12:41:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 77B84A1CDF; Wed, 10 Dec 2014 12:41:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 011711C27FD for ; Wed, 10 Dec 2014 12:41:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CD4B5320E8 for ; Wed, 10 Dec 2014 12:41:49 +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 uQSyz13XWwky for ; Wed, 10 Dec 2014 12:41:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by silver.osuosl.org (Postfix) with ESMTP id 090023229A for ; Wed, 10 Dec 2014 12:41:49 +0000 (UTC) Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 8FB2D9BAD7B01 for ; Wed, 10 Dec 2014 12:41:44 +0000 (GMT) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Wed, 10 Dec 2014 12:41:47 +0000 Received: from localhost.localdomain (192.168.154.104) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Wed, 10 Dec 2014 12:41:46 +0000 From: Vicente Olivert Riera To: Date: Wed, 10 Dec 2014 12:41:42 +0000 Message-ID: <1418215302-31208-1-git-send-email-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-Originating-IP: [192.168.154.104] Subject: [Buildroot] [PATCH] gnupg2: fix linking with intl X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" gnupg2 needs to link with intl if the toolchain needs gettext and locale is set. Otherwise we will see an error like this one: libgpg-error.a(libgpg_error_la-strsource.o): In function `gpg_strsource': strsource.c:(.text+0x4c): undefined reference to `libintl_dgettext' Fixes: http://autobuild.buildroot.net/results/9aa/9aaca74dd3a1f82e12358530db4d5d17eb833f7f/ Signed-off-by: Vicente Olivert Riera --- package/gnupg2/Config.in | 1 + package/gnupg2/gnupg2.mk | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in index d24eaae..92125d1 100644 --- a/package/gnupg2/Config.in +++ b/package/gnupg2/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_GNUPG2 select BR2_PACKAGE_LIBPTHSEM select BR2_PACKAGE_LIBPTHSEM_COMPAT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE depends on BR2_USE_MMU # libassuan help GnuPG is the GNU project's complete and free implementation diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 2d133aa..aabebd7 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -20,6 +20,11 @@ GNUPG2_CONF_OPTS = \ --with-pth-prefix=$(STAGING_DIR)/usr GNUPG2_CONF_ENV = gl_cv_header_working_stdint_h=yes +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) +GNUPG2_DEPENDENCIES += gettext +GNUPG2_CONF_ENV += LIBS=-lintl +endif + ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y) define GNUPG2_REMOVE_GPGV2 rm -f $(TARGET_DIR)/usr/bin/gpgv2