diff options
Diffstat (limited to 'mk/host-bottom.mk')
| -rw-r--r-- | mk/host-bottom.mk | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 29cfc57ea..26526dff9 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -56,9 +56,19 @@ endif ifeq (${HOST_CONFIG_STYLE},cmake) @$(CMD_TRACE) "configuring cmake.. " cd ${WRKBUILD}; PATH='${HOST_PATH}' \ - cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=$(STAGING_HOST_DIR)/usr \ ${HOST_CMAKE_FLAGS} ${WRKSRC} $(MAKE_TRACE) endif +ifeq (${HOST_CONFIG_STYLE},meson) + @$(CMD_TRACE) "configuring meson.. " + cd ${WRKSRC}; env PATH='${HOST_PATH}' CPPFLAGS='$(HOST_CPPFLAGS)' \ + LDFLAGS='$(HOST_LDFLAGS)' CFLAGS='$(HOST_CFLAGS)' \ + meson setup --prefix $(STAGING_HOST_DIR)/usr \ + --pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ + --buildtype release $(HOST_MESON_FLAGS) \ + --wrap-mode=nodownload \ + $(WRKSRC) $(WRKBUILD) $(MAKE_TRACE) +endif ifeq (${HOST_CONFIG_STYLE},perl) @$(CMD_TRACE) "configuring perl module.. " cd ${WRKBUILD}; \ @@ -77,7 +87,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)' LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' 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) endif @@ -99,6 +111,10 @@ ifeq (${HOST_INSTALL_STYLE},auto) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='${STAGING_HOST_DIR}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) endif +ifeq (${HOST_INSTALL_STYLE},meson) + DESTDIR='' PATH='$(HOST_PATH)' \ + ninja -C $(WRKBUILD) install $(MAKE_TRACE) +endif ifeq (${HOST_INSTALL_STYLE},manual) env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE) endif |