summaryrefslogtreecommitdiff
path: root/package/meson
diff options
context:
space:
mode:
Diffstat (limited to 'package/meson')
-rw-r--r--package/meson/Makefile6
-rw-r--r--package/meson/src/cross-compilation.conf.in9
2 files changed, 10 insertions, 5 deletions
diff --git a/package/meson/Makefile b/package/meson/Makefile
index 94716a688..510b75b1c 100644
--- a/package/meson/Makefile
+++ b/package/meson/Makefile
@@ -4,12 +4,12 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= meson
-PKG_VERSION:= 0.60.1
+PKG_VERSION:= 1.7.0
PKG_RELEASE:= 1
-PKG_HASH:= b06f7d621b90e094be0ea2157fa435648e069f19182d8d9402aa039727652b0c
+PKG_HASH:= a6ca46e2a11a0278bb6492ecd4e0520ff441b164ebfdef1e012b11beb848d26e
PKG_DESCR:= build utility
PKG_SECTION:= dev/tools
-HOST_BUILDDEP:= python3-host ninja-host
+HOST_BUILDDEP:= python3-host python3-setuptools-host ninja-host
PKG_URL:= http://www.mesonbuild.com/
PKG_SITES:= https://github.com/mesonbuild/meson/archive/
diff --git a/package/meson/src/cross-compilation.conf.in b/package/meson/src/cross-compilation.conf.in
index eb14312bc..b24c71cd8 100644
--- a/package/meson/src/cross-compilation.conf.in
+++ b/package/meson/src/cross-compilation.conf.in
@@ -8,13 +8,18 @@ c = '@TARGET_CROSS@gcc'
cpp = '@TARGET_CROSS@g++'
ar = '@TARGET_CROSS@ar'
strip = '@TARGET_CROSS@strip'
-pkgconfig = '@STAGING_HOST_DIR@/usr/bin/pkg-config'
+pkg-config = '@STAGING_HOST_DIR@/usr/bin/pkg-config'
+glib-compile-resources = '@STAGING_HOST_DIR@/usr/bin/glib-compile-resources'
+glib-compile-schemas = '@STAGING_HOST_DIR@/usr/bin/glib-compile-schemas'
+gdbus-codegen = '@STAGING_HOST_DIR@/usr/bin/gdbus-codegen'
-[properties]
+[built-in options]
c_args = [@TARGET_CFLAGS@]
c_link_args = [@TARGET_LDFLAGS@]
cpp_args = [@TARGET_CXXFLAGS@]
cpp_link_args = [@TARGET_LDFLAGS@]
+
+[properties]
needs_exe_wrapper = true
[host_machine]