Skip to contentSkip to conversation

package/pkg-meson: really generate the global cross-compilation.conf

PATCH New Thomas Petazzoni 1 participant 1 message Nov 6, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Cc Thomas De Schampheleire <[email protected]>
Cc Arnout Vandecappelle (Essensium/Mind) <[email protected]>
---
 package/pkg-meson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-meson.mk +1 -1
index b11bc3a7c0..e7eea2aa58 100644
@@ -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
Signature · 1 line
2.21.0