[Buildroot] [git commit branch/2020.08.x] package/pkg-meson.mk: fix generation of pkg_config_static prop

Peter Korsgaard peter at korsgaard.com
Fri Oct 2 08:39:52 UTC 2020


commit: https://git.buildroot.net/buildroot/commit/?id=df290ba86df67c6b36e2c226c1f594997836d641
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.08.x

fixes following in the generated cross-complation.conf file:
pkg_config_static = '$(if $(BR2_STATIC_LIBS),true,false)'

Signed-off-by: Norbert Lange <nolange79 at gmail.com>
Reviewed-by: Peter Seiderer <ps.report at gmx.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
(cherry picked from commit 78da84eca9a4a5d584369b10792253a80c37a8f9)
Signed-off-by: Peter Korsgaard <peter at korsgaard.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 c3fe6df5d0..3a34ba703b 100644
--- a/package/pkg-meson.mk
+++ b/package/pkg-meson.mk
@@ -195,7 +195,7 @@ define PKG_MESON_INSTALL_CROSS_CONF
 	    -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g" \
 	    -e 's%@HOST_DIR@%$(HOST_DIR)%g' \
 	    -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \
-	    -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \
+	    -e 's%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g' \
 	    $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \
 	    > $(HOST_DIR)/etc/meson/cross-compilation.conf.in
 	sed -e 's%@PKG_TARGET_CFLAGS@%%g' \


More information about the buildroot mailing list