From patchwork Tue Feb 4 12:40:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1233328 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.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.a=rsa-sha256 header.s=20161025 header.b=VMc/3Lju; 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 48BknQ3JkszB3wd for ; Tue, 4 Feb 2020 23:40:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0F86A854C0; Tue, 4 Feb 2020 12:40:40 +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 wU7YD-wD3Xat; Tue, 4 Feb 2020 12:40:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B40C285205; Tue, 4 Feb 2020 12:40:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 291B31BF346 for ; Tue, 4 Feb 2020 12:40:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1DD7286FC3 for ; Tue, 4 Feb 2020 12:40:32 +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 XI2CMrVzmRMW for ; Tue, 4 Feb 2020 12:40:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 392CD86F74 for ; Tue, 4 Feb 2020 12:40:31 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id t14so3440376wmi.5 for ; Tue, 04 Feb 2020 04:40:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nylllv6iwPi6j412zhv8GySS7VofnIXJbKuODBXJ1uE=; b=VMc/3LjualSMZnquPNrvZ5IA6eGzgxgZ2DzSDx8iOM6icRMHQByXPR3XXUZnfnvKnD tpbpov7xYPTlyjZ2uNAaWZtPrtKV9TQY+KF/2XWaCGfsCtbWgMMt8nIUDuI0spFHL3+E it2BRmqI+PKukIxACqVQP3GGKJrZEsDBII8xaJf19oA+WbVHLu6iBOTyj3mchRUzJ8Md A4LeJLB70JyIVJowOQbtIEc3uHJ1CZcAkwR7Jq1n1Y8sc32LqyiThqEBelEk9fEmJG3h A2XrJk9OgAXusUAd/5OF6x60PprbVOZ/qPXOQ3n6ODGWN0eEgYQowBtkPh772sUU1Wuw 6xCg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=nylllv6iwPi6j412zhv8GySS7VofnIXJbKuODBXJ1uE=; b=gDQ0wHrfywy6cJrHKJcAlTrdNJ1xUMMfV0LhX9ST8ecwzs+uiIUJYm/Qnj+2RxgOqm XGATCdLoZ7I0EBy4epxF4X+qz+CaQ03xZ6sM9TQ4LFt7x83B3BNht/mN0248fsgKoUYx 6gWP7s/V/8l9v4AynbqLBEuyBur8Rp1sFgQ49O0y2Kcbk9SBIKvunMYnki3A0agENBz+ TPxP8uFR0UOmLvqx5AtXW/lmD/hiHKaGBoTDwF+P9e+8NfwQn6riylKNl0NfkT5OR1y3 R1rCMVW7rL5WUMdtFirDZYKlI+75y5bcF/ONH9aFecx2ue+9YF5kA155PXjiM5k/1tTH Au6g== X-Gm-Message-State: APjAAAU0yq4IYZcNyq91MDU5h11/D+QfcuwVzfrqCtEPRz+SSZbXkM2B WWQRqJ93opOWJN5F8oBBZVYQ15qyXJLXWw== X-Google-Smtp-Source: APXvYqyEH2ZCEnMIERyvahixV4FQG/XO0Lefwz7bc8bJ1df/mPwn/QgT8aLRvBJxV20LyAoESVXI+Q== X-Received: by 2002:a7b:c932:: with SMTP id h18mr5612033wml.171.1580820029442; Tue, 04 Feb 2020 04:40:29 -0800 (PST) Received: from t450s.hexenhaus.local ([104.132.132.98]) by smtp.gmail.com with ESMTPSA id y20sm3853533wmj.23.2020.02.04.04.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 04:40:28 -0800 (PST) From: Heiko Thiery To: buildroot@buildroot.org Date: Tue, 4 Feb 2020 13:40:12 +0100 Message-Id: <20200204124013.17340-2-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200204124013.17340-1-heiko.thiery@gmail.com> References: <20200204124013.17340-1-heiko.thiery@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] autotools: do not overwrite first include path 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: Michael Walle , "Yann E . MORIN" , Heiko Thiery Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Michael Walle The first include path is special in aclocal. For example it is the path for the --install option. Also, the first include is treated in a special way if it doesn't exists. This might be the case if there is the following construct: configure.ac: AC_CONFIG_MACRO_DIR([m4]) Makefile.am: ACLOCAL_AMFLAGS="-I m4" If the package doesn't have local macros, the m4/ directory might not exist. aclocal will then just issue a warning instead of aborting the execution with a fatal error. See discussion here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663 Don't use the "-I" option in aclocal. Instead use ACLOCAL_PATH to pass the system-wide include dirs. As a side effect this should fix the use of $(ACLOCAL) alone. Up until now, $(ACLOCAL) didn't include the ACLOCAL_HOST_DIR system include path. autoreconf will pass the "-I" options to every tool it runs. So move the argument to each individual tool except aclocal. Signed-off-by: Michael Walle Signed-off-by: Heiko Thiery --- package/autoconf/autoconf.mk | 6 +++--- package/automake/automake.mk | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index e5f474c72d..336ac59b42 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -21,6 +21,6 @@ HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool $(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)" +AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 270337712e..89dcaa1293 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -32,4 +32,6 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOMAKE = $(HOST_DIR)/bin/automake ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal -ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR) +ACLOCAL = $(HOST_DIR)/bin/aclocal +ACLOCAL_PATH = $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR) +export ACLOCAL_PATH