ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-24 07:46:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

tools/meson: update to 1.3.2

Browse Source 
Add explicit setup as implicit is deprecated.

Rename pkgconfig as no hyphen is deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2024-02-21 13:13:34 -08:00 committed by Paul Spooren
parent 4ae474afbd
commit fcdc629144
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/meson.mk
View File

@ -98,6 +98,7 @@ endef
define Host/Configure/Meson define Host/Configure/Meson
$(call Meson/CreateNativeFile,$(HOST_BUILD_DIR)/openwrt-native.txt) $(call Meson/CreateNativeFile,$(HOST_BUILD_DIR)/openwrt-native.txt)
$(call Meson, \ $(call Meson, \
setup \
--native-file $(HOST_BUILD_DIR)/openwrt-native.txt \ --native-file $(HOST_BUILD_DIR)/openwrt-native.txt \
$(MESON_HOST_ARGS) \ $(MESON_HOST_ARGS) \
$(MESON_HOST_BUILD_DIR) \ $(MESON_HOST_BUILD_DIR) \
@ -121,6 +122,7 @@ define Build/Configure/Meson
$(call Meson/CreateNativeFile,$(PKG_BUILD_DIR)/openwrt-native.txt) $(call Meson/CreateNativeFile,$(PKG_BUILD_DIR)/openwrt-native.txt)
$(call Meson/CreateCrossFile,$(PKG_BUILD_DIR)/openwrt-cross.txt) $(call Meson/CreateCrossFile,$(PKG_BUILD_DIR)/openwrt-cross.txt)
$(call Meson, \ $(call Meson, \
setup \
--buildtype plain \ --buildtype plain \
--native-file $(PKG_BUILD_DIR)/openwrt-native.txt \ --native-file $(PKG_BUILD_DIR)/openwrt-native.txt \
--cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \ --cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \

4
tools/meson/Makefile
View File

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=meson PKG_NAME:=meson
PKG_VERSION:=1.2.1 PKG_VERSION:=1.3.2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION)
PKG_HASH:=b1db3a153087549497ee52b1c938d2134e0338214fe14f7efd16fecd57b639f5 PKG_HASH:=492eb450c8b073024276f916f5adbb3c4bb7e90e9e6ec124efda064f3d9b5baa
PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com> PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

2
tools/meson/files/openwrt-cross.txt.in
View File

@ -6,7 +6,7 @@ cpp_ld = [@LD@]
ar = '@AR@' ar = '@AR@'
strip = '@STRIP@' strip = '@STRIP@'
nm = '@NM@' nm = '@NM@'
pkgconfig = '@PKGCONFIG@' pkg-config = '@PKGCONFIG@'
cmake = '@CMAKE@' cmake = '@CMAKE@'
python = '@PYTHON@' python = '@PYTHON@'

2
tools/meson/files/openwrt-native.txt.in
View File

@ -1,7 +1,7 @@
[binaries] [binaries]
c = [@CC@] c = [@CC@]
cpp = [@CXX@] cpp = [@CXX@]
pkgconfig = '@PKGCONFIG@' pkg-config = '@PKGCONFIG@'
cmake = '@CMAKE@' cmake = '@CMAKE@'
python = '@PYTHON@' python = '@PYTHON@'