From 15e5974a9b4621a99eb86bc0fcad560996461562 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 2 Jan 2018 03:11:07 +0100
Subject: systemd: update to 236, convert to meson build
---
mk/package.mk | 4 ++++
mk/pkg-bottom.mk | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
(limited to 'mk')
diff --git a/mk/package.mk b/mk/package.mk
index 88dcaadb7..96add5789 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -15,6 +15,10 @@ AUTOTOOL_ENV+= PATH='${HOST_PATH}' \
PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
${COMMON_ENV}
+MESON_ENV+= PATH='${HOST_PATH}' \
+ PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
+ PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}'
+
CONFIGURE_ENV+= PATH='${TARGET_PATH}' \
${COMMON_ENV} \
${TARGET_ENV} \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 585420ace..868bd69fe 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -52,10 +52,10 @@ ifneq ($(filter manual,${CONFIG_STYLE}),)
env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)
else ifneq ($(filter meson,${CONFIG_STYLE}),)
@$(CMD_TRACE) "configuring meson.. "
- (cd ${WRKSRC} && PATH='${HOST_PATH}' \
+ (cd ${WRKSRC} && $(MESON_ENV) \
meson --prefix /usr --libdir lib \
--cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf \
- --buildtype release \
+ --buildtype release $(MESON_FLAGS) \
$(WRKSRC) $(WRKBUILD))
else ifneq ($(filter cmake,${CONFIG_STYLE}),)
@$(CMD_TRACE) "configuring cmake.. "
--
cgit v1.2.3