From patchwork Sun Feb 9 15:12:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1235453 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=HXazbyAz; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Fswh4XYMz9sPF for ; Mon, 10 Feb 2020 02:12:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 39EA0851AD; Sun, 9 Feb 2020 15:12:50 +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 vah2jUVpAZgz; Sun, 9 Feb 2020 15:12:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 84BB985132; Sun, 9 Feb 2020 15:12:49 +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 15AAD1BF2CA for ; Sun, 9 Feb 2020 15:12:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 12C0A85168 for ; Sun, 9 Feb 2020 15:12:47 +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 ZxCjZXCJxWQj for ; Sun, 9 Feb 2020 15:12:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4CCCC85108 for ; Sun, 9 Feb 2020 15:12:46 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id c9so4422742wrw.8 for ; Sun, 09 Feb 2020 07:12:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nlOgVAZSA3HstWOmP3OwYfcbe18xGKKIB260fQZHgHA=; b=HXazbyAzCOK0VOGETALvYTnplXbwn24r8pH6YywcwrcX1V3yjAhqELwC0Id4OOCcTB lELnC2SFuYn1iM0DzhVU8t00J88Sw9zFww5OKrXbZ+LXqmCAZQ+TLNqunrrDYQXqGyVX iB1OiNzpZJsdFXTX0pKkEtLMsrHEhSh7JnpvMnDE8ZWIRiZWeJJCnhlXCSve31zKkfyi cQcSgzjp1B9bDZno7lcwtx3SD22pDsgsmwdOrG8CqpP8pNGcGGYALHEegf1AEmIm4ofG lh3PgesNx6bmYIn3/CA5fU2vv2wVet+ozEw2a2tRnKf1slbZq2XztO8fSwRdVtpTAazv XsdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nlOgVAZSA3HstWOmP3OwYfcbe18xGKKIB260fQZHgHA=; b=VPXVIhFwWyI7b+d160oI+NtnaRiZ6vCkvNEfdzWa+NkMiz3PQJK06snU+3F8wPfqjV QFPCp+hNUBIVeUchUzGBiUsuUM2LH/ZOI05qVIG2ZHrKwaK70b3R/HJzNgjmvPg+Rokm 78t20FFX2LAmsGVHvDmm2cy9902kWktRwNJdgeCZFvftmPq3aYLOABN2LK8afn6cQ/3x 2BJydbm9i/1btRhvizk5iayWjA9/atrt3RHgH64paaJbJbUHVjNi5Apc9//sjW0cw8lF liELbL+vlc+rQDMfZCky1CyLUThC3oS9rZpOcAcWR0q51/Cy2OmDg0NLLHS6BibCA2Ja I69g== X-Gm-Message-State: APjAAAXbYFz/gbqsYb3VD8bsyKqPBhS5iU7J4yUHRzjV+/CkO227KZJE UVNmk+eDvwd83PmmRGhC94suYa09 X-Google-Smtp-Source: APXvYqzVZhMAKhOdZ+mpZ1u6OWX27PXURal8aLNONb4GcDBQIBj9TZy4siZT5LrHJs6lrUAeiAzPJg== X-Received: by 2002:adf:edc4:: with SMTP id v4mr11389927wro.336.1581261164504; Sun, 09 Feb 2020 07:12:44 -0800 (PST) Received: from scaer.home ([2a01:cb19:8b51:cb00:6468:f5f2:4935:acd5]) by smtp.gmail.com with ESMTPSA id n3sm11826646wmc.27.2020.02.09.07.12.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2020 07:12:44 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 9 Feb 2020 16:12:41 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] package/automake: also include autoconf-archive in search paths 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: Peter Korsgaard , Michael Walle , Thomas Petazzoni , Heiko Thiery , "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since d255b67972 (autotools: do not overwrite first include path), the ordering of include paths has changed: the system directories are specified with explicit options passed to autoreconf, which means that any directory specified in the package _AUTORECONF_OPTS are no longer first: - in package/autoconf/autoconf.mk, we define AUTORECONF as: AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" - in package/pkg-autotools.mk, we call AUTORECONF with: $($(PKG)_AUTORECONF_ENV) $(AUTORECONF) $($(PKG)_AUTORECONF_OPTS) For a package that needs autoconf-archive, this means that it has to provide a custom include directive, in its own _AUTORECONF_OPTS. This in turn means that this directory becomes the first, and goes directly opposite to what d255b67972 was supposed to accomplish. However, the path to the autoconf archive macro directory is mnot searched by default either, so a package has no way to add such an aclocal include directive. We can only add it in the global search directory, and we do so only for those packages that have autoconf-archive in their dependencies. Signed-off-by: Yann E. MORIN Cc: Michael Walle Cc: Heiko Thiery Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Peter Korsgaard Tested-by: Heiko Thiery --- package/automake/automake.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 89dcaa1293..238116cb94 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -33,5 +33,11 @@ $(eval $(host-autotools-package)) AUTOMAKE = $(HOST_DIR)/bin/automake ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal ACLOCAL = $(HOST_DIR)/bin/aclocal -ACLOCAL_PATH = $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR) +ACLOCAL_PATH = $(subst $(space),:,$(strip \ + $(ACLOCAL_DIR) \ + $(ACLOCAL_HOST_DIR) \ + $(if $(filter host-autoconf-archive,$($(PKG)_FINAL_ALL_DEPENDENCIES)),\ + $(HOST_DIR)/share/autoconf-archive \ + ) \ +)) export ACLOCAL_PATH