From 443b9f30755ca0b22ca8f4859c77078274be5f50 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 30 Dec 2017 10:56:35 +0100 Subject: [PATCH] package/meson: fix malformed cross-compilation.conf.in Currently, meson will set the c_link_args and the cpp_link_args to the value of TARGET_LDFLAGS, even when it's not defined. This creates a malformed array ["",] which will break any package building using meson/ninja. We fix that by using an empty replacement when the corresponding values are empty. Reported-by: Adam Duskett Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: alternate implementation, suggested by Thomas] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Tested-by: Adam Duskett aduskett@gmail.com Signed-off-by: Thomas Petazzoni --- package/meson/meson.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.mk b/package/meson/meson.mk index a05969c836..764c187ee7 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -16,15 +16,19 @@ HOST_MESON_NEEDS_HOST_PYTHON = python3 HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN)) HOST_MESON_TARGET_CPU = $(call qstrip,$(BR2_GCC_TARGET_CPU)) +HOST_MESON_SED_CFLAGS = $(if $(TARGET_CFLAGS),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`) +HOST_MESON_SED_LDFLAGS = $(if $(TARGET_LDFLAGS),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`) +HOST_MESON_SED_CXXFLAGS = $(if $(TARGET_CXXFLAGS),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`) + define HOST_MESON_INSTALL_CROSS_CONF mkdir -p $(HOST_DIR)/etc/meson sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \ -e "s%@TARGET_ARCH@%$(ARCH)%g" \ -e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \ -e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \ - -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \ - -e "s%@TARGET_LDFLAGS@%`printf '"%s", ' $(TARGET_LDFLAGS)`%g" \ - -e "s%@TARGET_CXXFLAGS@%`printf '"%s", ' $(TARGET_CXXFLAGS)`%g" \ + -e "s%@TARGET_CFLAGS@%$(HOST_MESON_SED_CFLAGS)%g" \ + -e "s%@TARGET_LDFLAGS@%$(HOST_MESON_SED_LDFLAGS)%g" \ + -e "s%@TARGET_CXXFLAGS@%$(HOST_MESON_SED_CXXFLAGS)%g" \ -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ > $(HOST_DIR)/etc/meson/cross-compilation.conf -- 2.30.2