From c2222f74c8eff592032473ab2d29d5e8febace63 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 4 Oct 2021 18:48:30 -0700
Subject: tools/meson: update to 0.59.2

Update install procedure based on upstream feedback. Normally, meson is
to be installed with pip. But as pip is not mandated by the build
system, it cannot be used. Upstream provides a nice script to pack meson
automatically.

Moved src/ to files/. No need to copy to BUILD_DIR.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 tools/meson/Makefile                    |  9 ++++++---
 tools/meson/files/openwrt-cross.txt.in  | 23 +++++++++++++++++++++++
 tools/meson/files/openwrt-native.txt.in | 13 +++++++++++++
 tools/meson/src/openwrt-cross.txt.in    | 23 -----------------------
 tools/meson/src/openwrt-native.txt.in   | 13 -------------
 5 files changed, 42 insertions(+), 39 deletions(-)
 create mode 100644 tools/meson/files/openwrt-cross.txt.in
 create mode 100644 tools/meson/files/openwrt-native.txt.in
 delete mode 100644 tools/meson/src/openwrt-cross.txt.in
 delete mode 100644 tools/meson/src/openwrt-native.txt.in

(limited to 'tools')

diff --git a/tools/meson/Makefile b/tools/meson/Makefile
index bae89654a5..0cf0efba47 100644
--- a/tools/meson/Makefile
+++ b/tools/meson/Makefile
@@ -1,11 +1,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=meson
-PKG_VERSION:=0.59.1
+PKG_VERSION:=0.59.2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION)
-PKG_HASH:=db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d
+PKG_HASH:=13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49
 
 PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
 PKG_LICENSE:=Apache-2.0
@@ -20,8 +20,11 @@ define Host/Compile
 endef
 
 define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+	$(HOST_BUILD_DIR)/packaging/create_zipapp.py $(HOST_BUILD_DIR) --interpreter $(STAGING_DIR_HOST)/bin/$(PYTHON) --outfile $(STAGING_DIR_HOST)/bin/meson
 	$(INSTALL_DIR) $(STAGING_DIR_HOST)/lib/meson
-	$(CP) $(HOST_BUILD_DIR)/* $(STAGING_DIR_HOST)/lib/meson/
+	$(INSTALL_CONF) files/openwrt-cross.txt.in $(STAGING_DIR_HOST)/lib/meson/
+	$(INSTALL_CONF) files/openwrt-native.txt.in $(STAGING_DIR_HOST)/lib/meson/
 endef
 
 define Host/Clean
diff --git a/tools/meson/files/openwrt-cross.txt.in b/tools/meson/files/openwrt-cross.txt.in
new file mode 100644
index 0000000000..30b4c116c4
--- /dev/null
+++ b/tools/meson/files/openwrt-cross.txt.in
@@ -0,0 +1,23 @@
+[binaries]
+c = [@CC@]
+cpp = [@CXX@]
+ar = '@AR@'
+strip = '@STRIP@'
+nm = '@NM@'
+pkgconfig = '@PKGCONFIG@'
+
+[built-in options]
+c_args = [@CFLAGS@]
+c_link_args = [@LDFLAGS@]
+cpp_args = [@CXXFLAGS@]
+cpp_link_args = [@LDFLAGS@]
+prefix = '/usr'
+
+[host_machine]
+system = 'linux'
+cpu_family = '@ARCH@'
+cpu = '@CPU@'
+endian = '@ENDIAN@'
+
+[properties]
+needs_exe_wrapper = true
diff --git a/tools/meson/files/openwrt-native.txt.in b/tools/meson/files/openwrt-native.txt.in
new file mode 100644
index 0000000000..50308ec8e4
--- /dev/null
+++ b/tools/meson/files/openwrt-native.txt.in
@@ -0,0 +1,13 @@
+[binaries]
+c = [@CC@]
+cpp = [@CXX@]
+pkgconfig = '@PKGCONFIG@'
+
+[built-in options]
+c_args = [@CFLAGS@]
+c_link_args = [@LDFLAGS@]
+cpp_args = [@CXXFLAGS@]
+cpp_link_args = [@LDFLAGS@]
+prefix = '@PREFIX@'
+sbindir = 'bin'
+libdir = 'lib'
diff --git a/tools/meson/src/openwrt-cross.txt.in b/tools/meson/src/openwrt-cross.txt.in
deleted file mode 100644
index 30b4c116c4..0000000000
--- a/tools/meson/src/openwrt-cross.txt.in
+++ /dev/null
@@ -1,23 +0,0 @@
-[binaries]
-c = [@CC@]
-cpp = [@CXX@]
-ar = '@AR@'
-strip = '@STRIP@'
-nm = '@NM@'
-pkgconfig = '@PKGCONFIG@'
-
-[built-in options]
-c_args = [@CFLAGS@]
-c_link_args = [@LDFLAGS@]
-cpp_args = [@CXXFLAGS@]
-cpp_link_args = [@LDFLAGS@]
-prefix = '/usr'
-
-[host_machine]
-system = 'linux'
-cpu_family = '@ARCH@'
-cpu = '@CPU@'
-endian = '@ENDIAN@'
-
-[properties]
-needs_exe_wrapper = true
diff --git a/tools/meson/src/openwrt-native.txt.in b/tools/meson/src/openwrt-native.txt.in
deleted file mode 100644
index 50308ec8e4..0000000000
--- a/tools/meson/src/openwrt-native.txt.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[binaries]
-c = [@CC@]
-cpp = [@CXX@]
-pkgconfig = '@PKGCONFIG@'
-
-[built-in options]
-c_args = [@CFLAGS@]
-c_link_args = [@LDFLAGS@]
-cpp_args = [@CXXFLAGS@]
-cpp_link_args = [@LDFLAGS@]
-prefix = '@PREFIX@'
-sbindir = 'bin'
-libdir = 'lib'
-- 
cgit v1.2.3