Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/pkg-meson: fix meson cpu_family format
@ 2019-02-25  0:52 james.hilliard1 at gmail.com
  2019-02-25 19:35 ` Peter Seiderer
  2019-02-25 21:12 ` Thomas Petazzoni
  0 siblings, 2 replies; 3+ messages in thread
From: james.hilliard1 at gmail.com @ 2019-02-25  0:52 UTC (permalink / raw)
  To: buildroot

From: James Hilliard <james.hilliard1@gmail.com>

meson requires a custom cpu_family format
https://mesonbuild.com/Reference-tables.html#cpu-families

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 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 a637299476..886fcf7205 100644
--- a/package/pkg-meson.mk
+++ b/package/pkg-meson.mk
@@ -64,7 +64,7 @@ define $(2)_CONFIGURE_CMDS
 	rm -rf $$($$(PKG)_SRCDIR)/build
 	mkdir -p $$($$(PKG)_SRCDIR)/build
 	sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \
-	    -e "s%@TARGET_ARCH@%$$(ARCH)%g" \
+	    -e "s%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
 	    -e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \
 	    -e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \
 	    -e "s%@TARGET_CFLAGS@%$$(HOST_MESON_SED_CFLAGS)%g" \
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 1/1] package/pkg-meson: fix meson cpu_family format
  2019-02-25  0:52 [Buildroot] [PATCH 1/1] package/pkg-meson: fix meson cpu_family format james.hilliard1 at gmail.com
@ 2019-02-25 19:35 ` Peter Seiderer
  2019-02-25 21:12 ` Thomas Petazzoni
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Seiderer @ 2019-02-25 19:35 UTC (permalink / raw)
  To: buildroot

Hello James,

On Mon, 25 Feb 2019 08:52:45 +0800, james.hilliard1 at gmail.com wrote:

> From: James Hilliard <james.hilliard1@gmail.com>
> 
> meson requires a custom cpu_family format
> https://mesonbuild.com/Reference-tables.html#cpu-families
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  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 a637299476..886fcf7205 100644
> --- a/package/pkg-meson.mk
> +++ b/package/pkg-meson.mk
> @@ -64,7 +64,7 @@ define $(2)_CONFIGURE_CMDS
>  	rm -rf $$($$(PKG)_SRCDIR)/build
>  	mkdir -p $$($$(PKG)_SRCDIR)/build
>  	sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \
> -	    -e "s%@TARGET_ARCH@%$$(ARCH)%g" \
> +	    -e "s%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
>  	    -e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \
>  	    -e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \
>  	    -e "s%@TARGET_CFLAGS@%$$(HOST_MESON_SED_CFLAGS)%g" \

Doing the same for package/pgk-meson.mk as commit 'package/meson: fix CPU familly' ([1])
does for package/meson/meson.mk (and by overlapping timing this change got lost for
the 'package/pkg-meson: support per-package directories' ([2]) patch)...

Reviewed-by: Peter Seiderer <ps.report@gmx.net>

Regards,
Peter

[1] https://git.buildroot.net/buildroot/commit/?id=f3bacda0c0e0adb2ac7f515476f6bb83d1385130
[2] https://git.buildroot.net/buildroot/commit/?id=5d882b71a8c0c87b0ccdea7ad620a8f44c33fcb1

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 1/1] package/pkg-meson: fix meson cpu_family format
  2019-02-25  0:52 [Buildroot] [PATCH 1/1] package/pkg-meson: fix meson cpu_family format james.hilliard1 at gmail.com
  2019-02-25 19:35 ` Peter Seiderer
@ 2019-02-25 21:12 ` Thomas Petazzoni
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2019-02-25 21:12 UTC (permalink / raw)
  To: buildroot

On Mon, 25 Feb 2019 08:52:45 +0800
james.hilliard1 at gmail.com wrote:

> From: James Hilliard <james.hilliard1@gmail.com>
> 
> meson requires a custom cpu_family format
> https://mesonbuild.com/Reference-tables.html#cpu-families
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/pkg-meson.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-02-25 21:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-25  0:52 [Buildroot] [PATCH 1/1] package/pkg-meson: fix meson cpu_family format james.hilliard1 at gmail.com
2019-02-25 19:35 ` Peter Seiderer
2019-02-25 21:12 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox