summaryrefslogtreecommitdiffstats
path: root/tools/meson/files
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2021-10-04 18:48:30 -0700
committerPaul Spooren <mail@aparcar.org>2021-10-07 14:09:40 -1000
commitc2222f74c8eff592032473ab2d29d5e8febace63 (patch)
treef15fb0d9c14946785d6731d1c80bf8680d56d913 /tools/meson/files
parente4e410733f3b0cad09d3a235eec0b04f4068c331 (diff)
downloadopenwrt-c2222f74c8eff592032473ab2d29d5e8febace63.tar.gz
openwrt-c2222f74c8eff592032473ab2d29d5e8febace63.tar.bz2
openwrt-c2222f74c8eff592032473ab2d29d5e8febace63.zip
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>
Diffstat (limited to 'tools/meson/files')
-rw-r--r--tools/meson/files/openwrt-cross.txt.in23
-rw-r--r--tools/meson/files/openwrt-native.txt.in13
2 files changed, 36 insertions, 0 deletions
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'