diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2023-01-12 18:16:16 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2023-01-19 03:47:13 +0100 |
| commit | c4012542401ce202e5e4d61ebcbb38fc875d19a4 (patch) | |
| tree | c90e83fd4d3e8458e38d9edf1c1b9cfc28dc49e5 /mk | |
| parent | cee21cdad9a4686842ccb54ef3b4485dcb4ab1f7 (diff) | |
weston: update to 11.0.0, update dependencies
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/host-bottom.mk | 6 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 9daf8f7c6..f7e635f15 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -64,8 +64,8 @@ ifeq (${HOST_CONFIG_STYLE},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) + --buildtype release $(HOST_MESON_FLAGS) \ + $(WRKSRC) $(WRKBUILD) $(MAKE_TRACE) endif ifeq (${HOST_CONFIG_STYLE},perl) @$(CMD_TRACE) "configuring perl module.. " @@ -86,7 +86,7 @@ host-build: ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} @$(CMD_TRACE) "compiling.. " ifneq ($(filter meson,${HOST_STYLE}),) - PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) + PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) 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) diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 424a42ca9..7c333f339 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -57,7 +57,7 @@ else ifneq ($(filter meson,${CONFIG_STYLE}),) --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf \ --build.pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ --buildtype release $(MESON_FLAGS) \ - $(WRKSRC) $(WRKBUILD)) + $(WRKSRC) $(WRKBUILD)) $(MAKE_TRACE) else ifneq ($(filter cmake,${CONFIG_STYLE}),) @$(CMD_TRACE) "configuring cmake.. " sed -e "s#@@TARGET_CC@@#$(TARGET_CC_NO_CCACHE)#" \ @@ -139,7 +139,7 @@ ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE} @env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE) @$(CMD_TRACE) "compiling.. " ifneq ($(filter meson,${BUILD_STYLE}),) - PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) + PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) else ifneq ($(filter manual,${BUILD_STYLE}),) env ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} do-build $(MAKE_TRACE) else ifeq ($(strip ${BUILD_STYLE}),) |