diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2018-01-02 03:11:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2018-01-02 03:12:33 +0100 |
| commit | 15e5974a9b4621a99eb86bc0fcad560996461562 (patch) | |
| tree | 02bf8c7cd819521a9489a5877be0bcd39762a9d8 /mk | |
| parent | 6f557a2d9f96c86fae70b03b4e54559d8df41b67 (diff) | |
systemd: update to 236, convert to meson build
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/package.mk | 4 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 4 |
2 files changed, 6 insertions, 2 deletions
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.. " |