From patchwork Sat Apr 22 11:59:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 753772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w9B5y4YjMz9s7d for ; Sat, 22 Apr 2017 22:01:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7391F8ACC6; Sat, 22 Apr 2017 12:01:18 +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 H+MrSucdrlbM; Sat, 22 Apr 2017 12:01:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A74628ACED; Sat, 22 Apr 2017 12:01:17 +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 CE23D1C01F7 for ; Sat, 22 Apr 2017 12:00:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C7E7F8653C for ; Sat, 22 Apr 2017 12:00:33 +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 f79O8TioIsk2 for ; Sat, 22 Apr 2017 12:00:33 +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 30E408648C for ; Sat, 22 Apr 2017 12:00:33 +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; Sat, 22 Apr 2017 14:00:08 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: Date: Sat, 22 Apr 2017 13:59:55 +0200 Message-ID: <20170422115955.22718-13-arnout@mind.be> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170422115955.22718-1-arnout@mind.be> References: <20170422115955.22718-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 v8 12/12] e2fsprogs: only add -lintl for static builds 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" From: Carlos Santos For dynamic library builds, it's not needed to pass it explicitly. Signed-off-by: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/e2fsprogs/e2fsprogs.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index a60c69b395..84af7abab8 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -77,17 +77,19 @@ HOST_E2FSPROGS_CONF_ENV += \ ac_cv_header_magic_h=no \ ac_cv_lib_magic_magic_file=no -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_STATIC_LIBS),yy) # util-linux libuuid pulls in libintl if needed, so ensure we also # link against it, otherwise static linking fails E2FSPROGS_CONF_ENV += LIBS=-lintl endif E2FSPROGS_MAKE_OPTS = LDCONFIG=true + E2FSPROGS_INSTALL_STAGING_OPTS = \ DESTDIR=$(STAGING_DIR) \ LDCONFIG=true \ install-libs + E2FSPROGS_INSTALL_TARGET_OPTS = \ DESTDIR=$(TARGET_DIR) \ LDCONFIG=true \