From patchwork Thu Aug 25 20:13:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 662926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sKwPR1p1Rz9sBg for ; Fri, 26 Aug 2016 06:14:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7FAB886722; Thu, 25 Aug 2016 20:14:17 +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 NNVGF6s6qYtM; Thu, 25 Aug 2016 20:14:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 834DC854A1; Thu, 25 Aug 2016 20:14:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E2CAA1C1ECC for ; Thu, 25 Aug 2016 20:14:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DE6ABC09A4 for ; Thu, 25 Aug 2016 20:14:13 +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 2VubQs7urRDw for ; Thu, 25 Aug 2016 20:14:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from exchange.essensium.com (220.77.144.195.ipv4.evonet.be [195.144.77.220]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E3E46C09A0 for ; Thu, 25 Aug 2016 20:14:12 +0000 (UTC) Received: from localhost.localdomain (10.3.7.11) by beleexch01.local.ess-mail.com (10.3.7.8) with Microsoft SMTP Server (TLS) id 15.0.847.32; Thu, 25 Aug 2016 22:13:41 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: Date: Thu, 25 Aug 2016 22:13:36 +0200 Message-ID: <20160825201336.6751-2-arnout@mind.be> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160825201336.6751-1-arnout@mind.be> References: <20160825201336.6751-1-arnout@mind.be> MIME-Version: 1.0 X-Originating-IP: [10.3.7.11] X-ClientProxiedBy: beleexch01.local.ess-mail.com (10.3.7.8) To beleexch01.local.ess-mail.com (10.3.7.8) Subject: [Buildroot] [PATCH v2 2/2] package/iputils: link with -lintl 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" libgcrypt pulls in gpg-error which links with libintl if available. Since iputils doesn't use libtool, -lintl has to be passed explicitly for static builds. Fixes: http://autobuild.buildroot.net/results/f81/f81eabb37788aa6dcdadf4034889c84bef78b876 http://autobuild.buildroot.net/results/f29/f296e8fba1e79f96d3d119aa4c8207ed4b80694b http://autobuild.buildroot.net/results/478/478a88cd892a119970cfca717ea7f5517bfc4cea http://autobuild.buildroot.net/results/920/920d2d1d967691779f79fa54a38fac5adc5a8ee4 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Matthew Weber --- v2: add BR2_STATIC_LIBS to the condition (Baruch) Only add -lintl when libgcrypt is selected. I also tested without libgcrypt (thus without -lintl) and with libcap, nettle, openssl. No problem there. --- package/iputils/iputils.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index d6398f7..42dab08 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -36,6 +36,13 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) IPUTILS_MAKE_OPTS += USE_GCRYPT=yes IPUTILS_DEPENDENCIES += libgcrypt +# When gettext is enabled (BR2_PACKAGE_GETTEXT=y), and provides libintl +# (BR2_NEEDS_GETTEXT=y), libgpg-error will link with libintl, and libgpg-error +# is pulled in by libgcrypt. Since iputils doesn't use libtool, we have to link +# with libintl explicitly for static linking, +ifeq ($(BR2_STATIC_LIBS)$(BR2_NEEDS_GETTEXT)$(BR2_PACKAGE_GETTEXT),yyy) +IPUTILS_MAKE_OPTS += ADDLIB='-lintl' +endif else IPUTILS_MAKE_OPTS += USE_GCRYPT=no endif