diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2021-11-11 10:29:02 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2021-11-11 10:29:02 +0100 |
| commit | 027afd3baf0bbbe97763151392deb5f9eabcc947 (patch) | |
| tree | 9cd268ffbbc616a4eaa61005b1dc39eccaf62997 /mk | |
| parent | 92d78fe401943687441b5fc60ae6f548ea14410b (diff) | |
meson: update to 0.60.1
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/host-bottom.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 29cfc57ea..621693ec3 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -59,6 +59,14 @@ ifeq (${HOST_CONFIG_STYLE},cmake) cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \ ${HOST_CMAKE_FLAGS} ${WRKSRC} $(MAKE_TRACE) endif +ifeq (${HOST_CONFIG_STYLE},meson) + @$(CMD_TRACE) "configuring meson.. " + cd ${WRKSRC}; PATH='${HOST_PATH}' \ + meson --prefix $(STAGING_HOST_DIR)/usr \ + --pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ + --buildtype release $(MESON_FLAGS) \ + $(WRKSRC) $(WRKBUILD) +endif ifeq (${HOST_CONFIG_STYLE},perl) @$(CMD_TRACE) "configuring perl module.. " cd ${WRKBUILD}; \ @@ -77,7 +85,9 @@ endif host-build: ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} @$(CMD_TRACE) "compiling.. " -ifneq (${HOST_STYLE},manual) +ifneq ($(filter meson,${HOST_STYLE}),) + PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) +else ifneq (${HOST_STYLE},manual) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) endif |