From c2222f74c8eff592032473ab2d29d5e8febace63 Mon Sep 17 00:00:00 2001 From: Rosen Penev 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 --- tools/meson/files/openwrt-cross.txt.in | 23 +++++++++++++++++++++++ tools/meson/files/openwrt-native.txt.in | 13 +++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 tools/meson/files/openwrt-cross.txt.in create mode 100644 tools/meson/files/openwrt-native.txt.in (limited to 'tools/meson/files') 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' -- cgit v1.2.3