From patchwork Wed Nov 6 15:25:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1190519 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 477VjC24DNz9sPF for ; Thu, 7 Nov 2019 02:25:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2AE59203AB; Wed, 6 Nov 2019 15:25:33 +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 ILi-S6c+YyKv; Wed, 6 Nov 2019 15:25:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4657722850; Wed, 6 Nov 2019 15:25:32 +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 B6D841BF36C for ; Wed, 6 Nov 2019 15:25:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9A3708A763 for ; Wed, 6 Nov 2019 15:25:30 +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 RrDm-qKe8pbz for ; Wed, 6 Nov 2019 15:25:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by hemlock.osuosl.org (Postfix) with ESMTPS id B51158A760 for ; Wed, 6 Nov 2019 15:25:28 +0000 (UTC) Received: from localhost (lfbn-tou-1-421-123.w86-206.abo.wanadoo.fr [86.206.246.123]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 597B5240004; Wed, 6 Nov 2019 15:25:25 +0000 (UTC) From: Thomas Petazzoni To: buildroot@buildroot.org Date: Wed, 6 Nov 2019 16:25:23 +0100 Message-Id: <20191106152523.16543-1-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/pkg-meson: really generate the global cross-compilation.conf 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: Eric Le Bihan , Thomas De Schampheleire , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit ccc9e05990a44d8db5825c07ed61d405ebb40caa ("package/meson: install cross-compilation.conf during toolchain install") moved the logic to generate the global cross-compilation.conf from package/meson/meson.mk to package/pkg-meson.mk. While doing so, it renamed the macro from HOST_MESON_INSTALL_CROSS_CONF to PKG_MESON_INSTALL_CROSS_CONF, but the registration of this hook in TOOLCHAIN_POST_INSTALL_STAGING_HOOKS was not changed accordingly: it is still registering HOST_MESON_INSTALL_CROSS_CONF. Due to this, the global cross-compilation.conf file was no longer generated. Signed-off-by: Thomas Petazzoni Cc: Thomas De Schampheleire Cc: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index b11bc3a7c0..e7eea2aa58 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -205,4 +205,4 @@ define PKG_MESON_INSTALL_CROSS_CONF > $(HOST_DIR)/etc/meson/cross-compilation.conf endef -TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += HOST_MESON_INSTALL_CROSS_CONF +TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += PKG_MESON_INSTALL_CROSS_CONF