aboutsummaryrefslogtreecommitdiffstats
path: root/tools/meson/files
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2022-03-16 16:18:07 -0700
committerDaniel Golle <daniel@makrotopia.org>2022-04-10 16:26:01 +0100
commit0db5044f511650bb00a397de1cc63d7f4883a2f5 (patch)
treef44c9cc4e707bd9f90bcfeb4b16beadad2cf8f30 /tools/meson/files
parenta650f4abfb306d131d2c8a14ec454ccd49101e47 (diff)
downloadupstream-0db5044f511650bb00a397de1cc63d7f4883a2f5.tar.gz
upstream-0db5044f511650bb00a397de1cc63d7f4883a2f5.tar.bz2
upstream-0db5044f511650bb00a397de1cc63d7f4883a2f5.zip
tools/meson: update to 0.61.4
Override python to use the one in host instead of hostpkg. There's no need to use the latter. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit 19f3fcc884cab348cfba823f1175baf7aa4de15f)
Diffstat (limited to 'tools/meson/files')
-rw-r--r--tools/meson/files/openwrt-cross.txt.in1
-rw-r--r--tools/meson/files/openwrt-native.txt.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/meson/files/openwrt-cross.txt.in b/tools/meson/files/openwrt-cross.txt.in
index 56aa393d63..ec4b027f1b 100644
--- a/tools/meson/files/openwrt-cross.txt.in
+++ b/tools/meson/files/openwrt-cross.txt.in
@@ -6,6 +6,7 @@ strip = '@STRIP@'
nm = '@NM@'
pkgconfig = '@PKGCONFIG@'
cmake = '@CMAKE@'
+python = '@PYTHON@'
[built-in options]
c_args = [@CFLAGS@]
diff --git a/tools/meson/files/openwrt-native.txt.in b/tools/meson/files/openwrt-native.txt.in
index eba63c00b1..48e09ece2c 100644
--- a/tools/meson/files/openwrt-native.txt.in
+++ b/tools/meson/files/openwrt-native.txt.in
@@ -3,6 +3,7 @@ c = [@CC@]
cpp = [@CXX@]
pkgconfig = '@PKGCONFIG@'
cmake = '@CMAKE@'
+python = '@PYTHON@'
[built-in options]
c_args = [@CFLAGS@]