Skip to contentSkip to conversation

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

PATCH New Yann E. MORIN 1 participant 1 message Nov 8, 2019

lore
Share & tools
lore

Yann E. MORIN

author Applied
#0 lore raw

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

Thomas, All,

On 2019-11-06 16:25 +0100, Thomas Petazzoni spake thusly:

Quoted 9 lines

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.

Quoted 6 lines

Due to this, the global cross-compilation.conf file was no longer generated.

Signed-off-by Thomas Petazzoni <[email protected]>
Cc Thomas De Schampheleire <[email protected]>
Cc Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Applied to master. Thanks.

Regards,
Yann E. MORIN.

Quoted 21 lines
---
 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 · 6 lines
2.21.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'