From 51bac54bbf0f8a545ca30cea6f1f10a0de7623ea Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 6 Nov 2019 16:25:23 +0100 Subject: [PATCH] package/pkg-meson: really generate the global cross-compilation.conf 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) Signed-off-by: Yann E. MORIN --- 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