[Buildroot] [PATCH 1/1] package/pkg-meson.mk: Fix cross-compilation.conf
Yann E. MORIN
yann.morin.1998 at free.fr
Wed Mar 11 21:31:24 UTC 2020
Gleb, All,
On 2020-03-11 19:11 +0000, Gleb Mazovetskiy spake thusly:
> $$(STAGING_DIR) -> $(STAGING_DIR) in PKG_MESON_INSTALL_CROSS_CONF.
>
> $$ resulted in `$(STAGING_DIR)` in the file instead of the expanded
> value.
>
> Note that this change only affects the etc config at:
> host/etc/meson/cross-compilation.conf
>
> Per-package cross-compilation.conf files are already correct.
>
> Reviewed-by: Peter Seiderer <ps.report at gmx.net>
> Signed-off-by: Gleb Mazovetskiy <glex.spb at gmail.com>
Applied to master, thanks.
Regards,
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 642b715938..416129f6fe 100644
> --- a/package/pkg-meson.mk
> +++ b/package/pkg-meson.mk
> @@ -193,7 +193,7 @@ define PKG_MESON_INSTALL_CROSS_CONF
> -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \
> -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \
> -e 's%@HOST_DIR@%$(HOST_DIR)%g' \
> - -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \
> + -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \
> $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \
> > $(HOST_DIR)/etc/meson/cross-compilation.conf.in
> sed -e 's%@PKG_TARGET_CFLAGS@%%g' \
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list