Skip to contentSkip to conversation

package/pkg-meson: fix meson cpu_family format

PATCH New james.hilliard1 at gmail.com 3 participants 3 messages Feb 25, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/pkg-meson: fix meson cpu_family format

From: James Hilliard <[email protected]>

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

---
 package/pkg-meson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-meson.mk +1 -1
index a637299476..886fcf7205 100644
@@ -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" \
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 package/pkg-meson: fix meson cpu_family format

Hello James,

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

From: James Hilliard <[email protected]>

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

---
 package/pkg-meson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-meson.mk +0 -0
index a637299476..886fcf7205 100644

package/pkg-meson.mk define $(2)_CONFIGURE_CMDS · line 70

Quoted 8 lines
package/pkg-meson.mk +1 -1
@@ -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)...

Regards,
Peter

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

#2 lore raw

PATCH 1/1 package/pkg-meson: fix meson cpu_family format

In reply to james.hilliard1 at gmail.com
Quoted 9 lines · On Mon, 25 Feb 2019 08:52:45 +0800 james.hilliard1 at gmail.com wrote:

From: James Hilliard <[email protected]>

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

---
 package/pkg-meson.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com