meson: update to 0.60.1

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

package/meson/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		meson
-PKG_VERSION:=		0.55.3
+PKG_VERSION:=		0.60.1
 PKG_RELEASE:=		1
-PKG_HASH:=		2b276df50c5b13ccdbfb14d3333141e9e7985aca31b60400b3f3e0be2ee6897e
+PKG_HASH:=		b06f7d621b90e094be0ea2157fa435648e069f19182d8d9402aa039727652b0c
 PKG_DESCR:=		build utility
 PKG_SECTION:=		dev/tools
 HOST_BUILDDEP:=		python3-host ninja-host
@@ -42,6 +42,13 @@ meson-hostinstall:
 		$(WRKBUILD)/cross-compilation.conf.in \
 		> $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf
 	sed -i "s/\"/'/g" $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf
+	sed -e "s%@HOST_CFLAGS@%`printf '"%s", ' $(HOST_CFLAGS)`%g" \
+	    -e "s%@HOST_LDFLAGS@%`printf '"%s", ' $(HOST_LDFLAGS)`%g" \
+	    -e "s%@HOST_CXXFLAGS@%`printf '"%s", ' $(HOST_CXXFLAGS)`%g" \
+	    -e "s%@STAGING_HOST_DIR@%$(STAGING_HOST_DIR)%g" \
+		$(WRKBUILD)/host-compilation.conf.in \
+		> $(STAGING_HOST_DIR)/etc/meson/host-compilation.conf
+	sed -i "s/\"/'/g" $(STAGING_HOST_DIR)/etc/meson/host-compilation.conf
 
 include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk