From patchwork Mon Apr 8 00:10:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 1080453 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.138; helo=whitealder.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="XLhDm2b1"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44crCn5jZdz9sR1 for ; Mon, 8 Apr 2019 10:00:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F1DED86C12; Mon, 8 Apr 2019 00:00:31 +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 cQYe0qixlmX3; Mon, 8 Apr 2019 00:00:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id CB5E6868CA; Mon, 8 Apr 2019 00:00:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9FF191BF857 for ; Mon, 8 Apr 2019 00:00:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6552D8697D for ; Mon, 8 Apr 2019 00:00:27 +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 0hnDWSJ+llxg for ; Mon, 8 Apr 2019 00:00:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 15E4485BAE for ; Mon, 8 Apr 2019 00:00:26 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id u24so1184031lfg.5 for ; Sun, 07 Apr 2019 17:00:25 -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=IayuCdJ2xL3ClHF9dZfObIXD9hIPEH2uuhGpNCepoHU=; b=XLhDm2b1Z+5qIA/oxoYvOj6Vrhm2MfnaBz/iC9yU5s3lYWODCVR+Sh6sSs2Iru7cA7 asjNS3i4CmyhjL6EDK9FThoqF2eKZXXKJUs1innBpuyOkYxKT3lRrBOp2x9wUntnQkq7 svsWUY0HWkSlxnkCITESiwbXnEn6ACJbAg9iDMJLX1VdFBgcPYHR+S5XqJI7uYvJE9wo drNMG9QOMf4+fLh6ewsalcI2z2GH/cBGUvBXiX/EpdkHD09X2RLbAmQ10sVwijcb870r 4rn3sVu9MbiHjuQZj7exfdWFQZrjL2qFRWSy9aOxLHMEDK2S46bBJg4Ojf4LJ7iXToI1 npqw== 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=IayuCdJ2xL3ClHF9dZfObIXD9hIPEH2uuhGpNCepoHU=; b=kTnuzH2hIP5OpRBdSaKLbitr6F9HKOdOCY6nb2Cbhoi2FJfKRCgWOuoSxe7jJMyaqe WmurBbPjMyup9pUwqDKU8M/C4x4/wVdIyX559E7KqaRcRGSIPWqXahWC5encQ3rRLCPn kNabz2DFRNefGcwgdB5E66MHkSXYj7aJsln2076AiyfD/1TKBt6Z4E7uUZCogg+uuota qARXCqL1zuhf9h1APUsLh8cBvPOhhCR1g3k5xKW/TPfaWQ8x/EJVei47+EVJt2bgNjhs +ONlOigCCfXRkdoSaV6TmCr4bfvxIeGL7JwTEpg2uvRyNSiOXx655Cpbfd0aM4JCuYHk ktUw== X-Gm-Message-State: APjAAAVsIILhEoXuSiBpv1lE+eMcSYef6dH/YdkbTM/Cd/0pqO14KPfw U7HM4g/xkryVX7s5lZSF4M0ObUZ0 X-Google-Smtp-Source: APXvYqz69I7DMHA7ekAk8vfJRPQ9HYS2EDL53EHk8IBY5vno3MYoDjP3EpEm7og/Yjw8lf+VKC4yhA== X-Received: by 2002:ac2:4a86:: with SMTP id l6mr4725311lfp.51.1554681623799; Sun, 07 Apr 2019 17:00:23 -0700 (PDT) Received: from vkochan-ThinkPad-T470p.lan ([93.75.250.209]) by smtp.gmail.com with ESMTPSA id c5sm6695217ljd.18.2019.04.07.17.00.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Apr 2019 17:00:23 -0700 (PDT) From: Vadim Kochan To: buildroot@buildroot.org Date: Mon, 8 Apr 2019 03:10:21 +0300 Message-Id: <20190408001021.12249-1-vadim4j@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] package/gettext-gnu: Fix GETTEXTIZE is not defined in case of full gettext X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Vadim Kochan MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" After introducing gettext-tiny in: 5367a1b253 package/gettext-tiny: new package GETTEXTIZE variable is defined separately by gettext-gnu or gettext-tiny package depending on which of them is enabled. But it causes the issue when BR2_TOOLCHAIN_HAS_FULL_GETTEXT=y, because in that case BR2_PACKAGE_GETTEXT is not selected by BR2_SYSTEM_ENABLE_NLS config and GETTEXTIZE is not defined, which causes build fail for packages which uses gettextizing (e.g. host-flex). Fix issue by defining GETTEXTIZE in package/gettext/gettext.mk, the definition is almost same for gettext-gnu and gettext-tiny with only difference in additional 'data_dir' variable for gettext-tiny case. Reported-by: Romain Naour Signed-off-by: Vadim Kochan --- package/gettext-gnu/gettext-gnu.mk | 4 ---- package/gettext-tiny/gettext-tiny.mk | 7 ------- package/gettext/gettext.mk | 10 ++++++++++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package/gettext-gnu/gettext-gnu.mk b/package/gettext-gnu/gettext-gnu.mk index 61adf72738..33a1cbed38 100644 --- a/package/gettext-gnu/gettext-gnu.mk +++ b/package/gettext-gnu/gettext-gnu.mk @@ -95,9 +95,5 @@ endef HOST_GETTEXT_GNU_POST_INSTALL_HOOKS += HOST_GETTEXT_GNU_ADD_ABOUT_NLS -ifeq ($(BR2_PACKAGE_GETTEXT_GNU),y) -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/gettext-tiny/gettext-tiny.mk b/package/gettext-tiny/gettext-tiny.mk index 4fa014e8dd..4d002aba4b 100644 --- a/package/gettext-tiny/gettext-tiny.mk +++ b/package/gettext-tiny/gettext-tiny.mk @@ -105,12 +105,5 @@ define GETTEXT_TINY_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(GETTEXT_TINY_PKGDIR)/gettext-wrapper $(TARGET_DIR)/usr/bin/gettext endef -ifeq ($(BR2_SYSTEM_ENABLE_NLS),) -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) \ - AUTOM4TE=$(HOST_DIR)/bin/autom4te \ - gettext_datadir=$(HOST_DIR)/usr/share/gettext-tiny \ - $(HOST_DIR)/bin/gettextize -f -endif - $(eval $(generic-package)) $(eval $(host-generic-package)) diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index a86e26f69e..b836ebac57 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -4,5 +4,15 @@ # ################################################################################ +GETTEXTIZE_ENV = $(HOST_CONFIGURE_OPTS) \ + AUTOM4TE=$(HOST_DIR)/bin/autom4te + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),) +GETTEXTIZE_ENV += gettext_datadir=$(HOST_DIR)/usr/share/gettext-tiny +endif + +GETTEXTIZE = $(GETTEXTIZE_ENV) \ + $(HOST_DIR)/bin/gettextize -f + $(eval $(virtual-package)) $(eval $(host-virtual-package))