package/pkg-meson: really generate the global cross-compilation.conf
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>
Wed, 6 Nov 2019 15:25:23 +0000 (16:25 +0100)
committerYann E. MORIN <yann.morin.1998@free.fr>
Fri, 8 Nov 2019 20:41:39 +0000 (21:41 +0100)
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 <thomas.petazzoni@bootlin.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
package/pkg-meson.mk

index b11bc3a7c0d6850caa03b3b85204e2a5b032d028..e7eea2aa582fdcecb18d7c07fc1e7ab12bfb718a 100644 (file)
@@ -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