From patchwork Sun Aug 27 11:09:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Morgado X-Patchwork-Id: 806209 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aleksander-es.20150623.gappssmtp.com header.i=@aleksander-es.20150623.gappssmtp.com header.b="XBuoFPdj"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xgBxt1RKQz9sMN for ; Sun, 27 Aug 2017 21:09:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4CF2388D6B; Sun, 27 Aug 2017 11:09:49 +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 dTmGSBFmxl8U; Sun, 27 Aug 2017 11:09:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B9EE3888B5; Sun, 27 Aug 2017 11:09:47 +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 E459B1C0C39 for ; Sun, 27 Aug 2017 11:09:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DD6E42F487 for ; Sun, 27 Aug 2017 11:09:46 +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 oQ3ANPS7WSOE for ; Sun, 27 Aug 2017 11:09:46 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by silver.osuosl.org (Postfix) with ESMTPS id 033842C305 for ; Sun, 27 Aug 2017 11:09:45 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id m85so607793wma.4 for ; Sun, 27 Aug 2017 04:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aleksander-es.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=eEijJSo2UJMo2rrUfJvLPCAPa26gXOwqA24cRqN6Qew=; b=XBuoFPdjJRxlpM7n9fTWTN4RrzePboC3tXxfsxHYb8aWwDD/8UwKa2GaIur4RmsmA1 uPRF73h2Tt3kzqRREeRsHU6MwMd4wsK4Rd0c4TTf/i6ZMp7TlY3YJTMcaSJMxBfCmRrr YkYhhGE/elYeSTj6Hk48i0znjuQD4i+1+f3bV+EtA2fC8ZhN3bjYrGJSumjOUr4x2pwY 7VTOLbofVD5YRJxwqmrSBB6MTjfjy+S+rbaOq3+R5yXUJRVYilAw16rTxqp0VSttI+TW IMPjFj4fyRQeK9e4TsHsT3P0rgPfkPltbZQoJ76+/X9Z+3YEmQgV01ajR6Q/DrsGclKI zY0g== 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=eEijJSo2UJMo2rrUfJvLPCAPa26gXOwqA24cRqN6Qew=; b=P6Jej9+t6rQTYEMV7Y2kO6+XtZekPsn9E+V1hc+3q/1UMOxmOLaI/qA5WQXMg1G/h2 Dc4B31iqqRSZBTfi9zbiRnkF+7OrKlTwfUfYLkWglZndZyhgXUXvp4vZ5Tr7OIvgf+JV TGNYX2VNyBeZNFXUP14Zv+kHDWd7G+3GHO4CSad5c7SLGups25VjwfiCkgXopIBS3S+P evj6zEyk6J+t4Oscd64y3j9PE4eop7IcYyKqp2UpnnMn/un/AV1f6vB3aWZoeqSBEudJ 4R9uJIfQWd3mejv3QKeRC0MMh4d5X7iAzadNzVndN4fCce5nH87CtHqvdydIC1HRVgYJ j7EA== X-Gm-Message-State: AHYfb5hFEANhqHgGw6gRwRgWH/aubBdQ8KPyz6ZhN2A5nW8R9AR/DjgX kOiNmglY4enzF0qvK1WiQA== X-Received: by 10.28.185.16 with SMTP id j16mr1827096wmf.122.1503832184357; Sun, 27 Aug 2017 04:09:44 -0700 (PDT) Received: from localhost.localdomain (232.red-83-34-121.dynamicip.rima-tde.net. [83.34.121.232]) by smtp.gmail.com with ESMTPSA id n71sm4850104wmg.13.2017.08.27.04.09.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Aug 2017 04:09:43 -0700 (PDT) From: Aleksander Morgado To: buildroot@buildroot.org Date: Sun, 27 Aug 2017 13:09:20 +0200 Message-Id: <20170827110920.15579-1-aleksander@aleksander.es> X-Mailer: git-send-email 2.14.1 Cc: Aleksander Morgado Subject: [Buildroot] [PATCH] autoconf: use host-gettext's autopoint if available in autoreconf 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit 7ee8ebbd813ad0a6d2392ef628c17241 explicitly disabled autopoint calls during autoreconf, to avoid having the host autopoint called, as there was no host-gettext package. Commit 3a188b578e490f2a8b5922329b7abfae introduced the host-gettext package support. This commit recovers the support for automatically calling autopoint during autoreconf. Signed-off-by: Aleksander Morgado --- Hey, I see this is a recurring issue when a package that builds from git (bootstrapping using autoreconf before configure) requires gettext processing. automake would fail as autopoint wasn't being run (disabled in buildroot's autoconf package) and therefore not creating config.rpath and ABOUT-NLS (among other things, although these are the ones automake complains about). Specifying $(PKG)_GETTEXTIZE isn't an option as that may actually update the gnulib-imported files in a non-expected way, and "touch"-ing the missing files just seems a bit of a hack... Calling autopoint from autoreconf was disabled back in 2011 because no host-gettext package was available, but this package was added in 2013, so how about removing that limitation? Cheers! --- package/autoconf/autoconf.mk | 2 +- package/gettext/gettext.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index e5f474c72..f1c60224f 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -23,4 +23,4 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOCONF = $(HOST_DIR)/bin/autoconf AUTOHEADER = $(HOST_DIR)/bin/autoheader -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT="$(AUTOPOINT)" $(HOST_DIR)/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" --verbose diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index ec9588f8a..08afc8fc3 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -95,6 +95,7 @@ endef HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_ADD_ABOUT_NLS GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f +AUTOPOINT = $(HOST_DIR)/bin/autopoint $(eval $(autotools-package)) $(eval $(host-autotools-package))