aboutsummaryrefslogtreecommitdiff
path: root/package/pkg-meson.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/pkg-meson.mk')
-rw-r--r--package/pkg-meson.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk
index c3fe6df5d0..de0e6e8ea3 100644
--- a/package/pkg-meson.mk
+++ b/package/pkg-meson.mk
@@ -81,12 +81,17 @@ define $(2)_CONFIGURE_CMDS
-e "/^\[properties\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_PROPERTIES),\n$$(x)):" \
package/meson/cross-compilation.conf.in \
> $$($$(PKG)_SRCDIR)/build/cross-compilation.conf
- PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \
+ PATH=$$(BR_PATH) \
+ CC_FOR_BUILD="$(HOSTCC)" \
+ CXX_FOR_BUILD="$(HOSTCC)" \
+ $$($$(PKG)_CONF_ENV) \
+ $$(MESON) \
--prefix=/usr \
--libdir=lib \
--default-library=$(if $(BR2_STATIC_LIBS),static,shared) \
--buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
--cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \
+ -Dstrip=false \
-Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \
$$($$(PKG)_CONF_OPTS) \
$$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build
@@ -105,6 +110,7 @@ define $(2)_CONFIGURE_CMDS
--localstatedir=$$(HOST_DIR)/var \
--default-library=shared \
--buildtype=release \
+ -Dstrip=true \
$$($$(PKG)_CONF_OPTS) \
$$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build
endef
@@ -195,7 +201,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' \