diff --git a/include/meson.mk b/include/meson.mk index 74c9d3dd7fa..65716746fe1 100644 --- a/include/meson.mk +++ b/include/meson.mk @@ -98,6 +98,7 @@ endef define Host/Configure/Meson $(call Meson/CreateNativeFile,$(HOST_BUILD_DIR)/openwrt-native.txt) $(call Meson, \ + setup \ --native-file $(HOST_BUILD_DIR)/openwrt-native.txt \ $(MESON_HOST_ARGS) \ $(MESON_HOST_BUILD_DIR) \ @@ -121,6 +122,7 @@ define Build/Configure/Meson $(call Meson/CreateNativeFile,$(PKG_BUILD_DIR)/openwrt-native.txt) $(call Meson/CreateCrossFile,$(PKG_BUILD_DIR)/openwrt-cross.txt) $(call Meson, \ + setup \ --buildtype plain \ --native-file $(PKG_BUILD_DIR)/openwrt-native.txt \ --cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \ diff --git a/tools/meson/Makefile b/tools/meson/Makefile index 23bb393a593..96974faafe5 100644 --- a/tools/meson/Makefile +++ b/tools/meson/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=meson -PKG_VERSION:=1.2.1 +PKG_VERSION:=1.3.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION) -PKG_HASH:=b1db3a153087549497ee52b1c938d2134e0338214fe14f7efd16fecd57b639f5 +PKG_HASH:=492eb450c8b073024276f916f5adbb3c4bb7e90e9e6ec124efda064f3d9b5baa PKG_MAINTAINER:=Andre Heider PKG_LICENSE:=Apache-2.0 diff --git a/tools/meson/files/openwrt-cross.txt.in b/tools/meson/files/openwrt-cross.txt.in index ba119150691..836a0e51e4f 100644 --- a/tools/meson/files/openwrt-cross.txt.in +++ b/tools/meson/files/openwrt-cross.txt.in @@ -6,7 +6,7 @@ cpp_ld = [@LD@] ar = '@AR@' strip = '@STRIP@' nm = '@NM@' -pkgconfig = '@PKGCONFIG@' +pkg-config = '@PKGCONFIG@' cmake = '@CMAKE@' python = '@PYTHON@' diff --git a/tools/meson/files/openwrt-native.txt.in b/tools/meson/files/openwrt-native.txt.in index 48e09ece2c6..179e00b43ee 100644 --- a/tools/meson/files/openwrt-native.txt.in +++ b/tools/meson/files/openwrt-native.txt.in @@ -1,7 +1,7 @@ [binaries] c = [@CC@] cpp = [@CXX@] -pkgconfig = '@PKGCONFIG@' +pkg-config = '@PKGCONFIG@' cmake = '@CMAKE@' python = '@PYTHON@'