From patchwork Fri Aug 24 13:20:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 961848 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TK9zJHtB"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41xhZt5SBWz9ryn for ; Fri, 24 Aug 2018 23:14:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E0F3221570; Fri, 24 Aug 2018 13:14:42 +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 We4+F49T6UdC; Fri, 24 Aug 2018 13:14:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E74B724F06; Fri, 24 Aug 2018 13:14:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id EDAE31C26CD for ; Fri, 24 Aug 2018 13:14:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EB42D21570 for ; Fri, 24 Aug 2018 13:14:40 +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 ddOKRdY8bmkz for ; Fri, 24 Aug 2018 13:14:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by silver.osuosl.org (Postfix) with ESMTPS id 2A2A62209D for ; Fri, 24 Aug 2018 13:14:40 +0000 (UTC) Received: by mail-lj1-f194.google.com with SMTP id v26-v6so3050447ljj.3 for ; Fri, 24 Aug 2018 06:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=yB+QMXpeZVjUHoZ5nllYgih7QuFtvVSBtcrZPew5Czs=; b=TK9zJHtBlV6mnzcMwm+6bURzzWbaTeIMYvPTfbOc12/9uIkm3K49gOEBoH9jP8QXaB +W3CgsCNL1ED+4zUYA/8vS6ZVHMsc8HvY9h+X7dYT9TviA1Ie0TBlWFton+i3My0RHNS 6lar/L+sGGjUt0eMun7go1vKuvLU3DeVO5pKowPHhrIMgxM4nXrr2Zddg0cg3IB8/aua ugbQ7CH8fM8qxHw806K/8TwMkbTI5l3wW4Jd0RsiB252d8xRkclPa3imxz17vyGsdozv o7+1Sdp5LuvL84SZaCJVQeKFcOsR6BZ8S/uSs3uekx82WMQ6vaMOMamv7pp1KtuMCWuU tHNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yB+QMXpeZVjUHoZ5nllYgih7QuFtvVSBtcrZPew5Czs=; b=Q7OuLyIbTvGIBizNnQkAliaumDFiJL58FxZv/vHd0oKN8p0GICR/iOHdgLdY4yNtNf YyNUcH4Hb4orF5o/3qxDeGOXMx8JxJf+e3+aTw55Znd4Gx2gqrfbzkokNIU52WgmEdah uHjb1ivULpDkVwo+ED4PbiRc6YFmcOZro1yeVFjUHu2Nqq2sG7wde/oKMsy9ibw4sK1c rdxFzFJHufdlXawgCI5wpBnk0xwIFREBM3EWVs04xCNR6ZnKYyaznChqLVGHhJixUivH 3RkkNiBcnrK8yxuoDMTuZ703qb5OKQxmRpTGY3u/IIPtvOwO8/Ztpj5HpVd8qYwR7ay5 CcDA== X-Gm-Message-State: APzg51CKD6sfCQPYMqBDr8YQIGFaDHnKJDiCHMxvpRfTpHJXDNxJaUzD ZC2Xi1WGs80ixdwoYx1s5DFPf7EI X-Google-Smtp-Source: ANB0VdYtcUz9dJhWVw+zVYBykh4ogZlLsiXi8Ada9HE9ebXk/EtdN/r4ShkJdBCSAsyLxE+aMmWMbw== X-Received: by 2002:a2e:83d7:: with SMTP id s23-v6mr1445882ljh.82.1535116478169; Fri, 24 Aug 2018 06:14:38 -0700 (PDT) Received: from vkochan-ThinkPad-T470p.lan ([213.109.80.185]) by smtp.gmail.com with ESMTPSA id v18-v6sm921611ljv.49.2018.08.24.06.14.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Aug 2018 06:14:37 -0700 (PDT) From: Vadim Kochan To: buildroot@buildroot.org Date: Fri, 24 Aug 2018 16:20:49 +0300 Message-Id: <20180824132049.20330-1-vadim4j@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] git: Fix libintl linking if there is no full gettext support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vadim Kochan MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Vadim Kochan Git could not resolve libntl_xxx symbols if toolchain does no provide full gettext support but the gettext package is selected. In case of ulibc/musl toolchain there is no full getttext support, but they still provides libintl stub which makes git think there is full gettext support hence -lintl is not passed to the linker. Added workaround which checks if toolchain provides full gettext support, if no then -lintl will be added to EXTLIBS variable generated within config.mak file. Signed-off-by: Vadim Kochan --- package/git/git.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/git/git.mk b/package/git/git.mk index ac7b8f2e8c..2d3c3cc2c1 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -63,8 +63,18 @@ endif ifeq ($(BR2_SYSTEM_ENABLE_NLS),) GIT_MAKE_OPTS += NO_GETTEXT=1 +else +ifeq ($(BR2_TOOLCHAIN_HAS_FULL_GETTEXT),) +GIT_EXTLIBS += -lintl +endif endif +define GIT_GEN_EXT_CONFIG_CMDS + echo "EXTLIBS = $(GIT_EXTLIBS)" >> $(@D)/config.mak +endef + +GIT_POST_CONFIGURE_HOOKS += GIT_GEN_EXT_CONFIG_CMDS + GIT_INSTALL_TARGET_OPTS = $(GIT_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install # assume yes for these tests, configure will bail out otherwise