meson: Strip quotes from BR2_ENDIAN
PATCH 1/1 meson: Strip quotes from BR2_ENDIAN
Strips the quotes from BR2_ENDIAN because meson expects the value to be unquoted.
Also uses the same values in target-specific cross-config as in the /etc one.
--- package/meson/meson.mk | 2 +- package/pkg-meson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
package/meson/meson.mk +1 -1
@@ -13,7 +13,7 @@ MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja HOST_MESON_NEEDS_HOST_PYTHON = python3 -HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN)) +HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) # https://mesonbuild.com/Reference-tables.html#cpu-families
package/pkg-meson.mk +2 -2
@@ -69,8 +69,8 @@ define $(2)_CONFIGURE_CMDS mkdir -p $$($$(PKG)_SRCDIR)/build sed -e 's%@TARGET_CROSS@%$$(TARGET_CROSS)%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_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ + -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \
Signature · 1 line
2.20.1
PATCH 1/1 meson: Strip quotes from BR2_ENDIAN
Hello Gleb,
Quoted 30 lines · Gleb Mazovetskiy
Strips the quotes from
BR2_ENDIANbecause meson expects the value to be unquoted.Also uses the same values in target-specific cross-config as in the /etc one.
Signed-off-by Gleb Mazovetskiy <[email protected]>--- package/meson/meson.mk | 2 +- package/pkg-meson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)package/meson/meson.mk +1
-1@@ -13,7 +13,7 @@ MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja HOST_MESON_NEEDS_HOST_PYTHON = python3 -HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN)) +HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) # https://mesonbuild.com/Reference-tables.html#cpu-familiespackage/pkg-meson.mk +0
-0
package/pkg-meson.mk define $(2)_CONFIGURE_CMDS · line 76
Quoted 10 lines
package/pkg-meson.mk +2
-2@@ -69,8 +69,8 @@ define $(2)_CONFIGURE_CMDS mkdir -p $$($$(PKG)_SRCDIR)/build sed -e 's%@TARGET_CROSS@%$$(TARGET_CROSS)%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_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ + -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \
Regards,
Peter
PATCH 1/1 meson: Strip quotes from BR2_ENDIAN
In reply to Gleb MazovetskiyGleb, Al,
On 2020-03-11 18:38 +0000, Gleb Mazovetskiy spake thusly:
Quoted 7 lines
Strips the quotes from
BR2_ENDIANbecause meson expects the value to be unquoted.Also uses the same values in target-specific cross-config as in the /etc one.
Signed-off-by Gleb Mazovetskiy <[email protected]>
I've expanded the commit log with more in-depth explanations, and pushed to master, thanks!
Regards,
Yann E. MORIN.
Quoted 40 lines
--- package/meson/meson.mk | 2 +- package/pkg-meson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)package/meson/meson.mk +1
-1@@ -13,7 +13,7 @@ MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja HOST_MESON_NEEDS_HOST_PYTHON = python3 -HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN)) +HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) # https://mesonbuild.com/Reference-tables.html#cpu-familiespackage/pkg-meson.mk +2
-2@@ -69,8 +69,8 @@ define $(2)_CONFIGURE_CMDS mkdir -p $$($$(PKG)_SRCDIR)/build sed -e 's%@TARGET_CROSS@%$$(TARGET_CROSS)%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_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ + -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \Signature · 6 lines
2.20.1 _______________________________________________ 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 meson: Strip quotes from BR2_ENDIAN
In reply to Gleb MazovetskiyQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gleb" == Gleb Mazovetskiy <[email protected]> writes:
Strips the quotes from
BR2_ENDIANbecause meson expects the value to be unquoted.Also uses the same values in target-specific cross-config as in the /etc one.
Signed-off-by Gleb Mazovetskiy <[email protected]>
Committed to 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard