diff options
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | package/meson/Makefile | 4 | ||||
| -rw-r--r-- | package/meson/src/cross-compilation.conf.in | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 7c333f339..76f7b3e81 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -53,7 +53,7 @@ ifneq ($(filter manual,${CONFIG_STYLE}),) else ifneq ($(filter meson,${CONFIG_STYLE}),) @$(CMD_TRACE) "configuring meson.. " (cd ${WRKSRC} && $(MESON_ENV) \ - meson --prefix /usr --libdir lib \ + meson setup --prefix /usr --libdir lib \ --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf \ --build.pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ --buildtype release $(MESON_FLAGS) \ diff --git a/package/meson/Makefile b/package/meson/Makefile index 9456baa77..b367eafdc 100644 --- a/package/meson/Makefile +++ b/package/meson/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= meson -PKG_VERSION:= 1.0.0 +PKG_VERSION:= 1.3.1 PKG_RELEASE:= 1 -PKG_HASH:= a2ada84d43c7e57400daee80a880a1f5003d062b2cb6c9be1747b0db38f2eb8d +PKG_HASH:= 274c121edb859602eb4589d31d8791e980748bb19950fc6f611a21d76dc22cc6 PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= python3-host ninja-host diff --git a/package/meson/src/cross-compilation.conf.in b/package/meson/src/cross-compilation.conf.in index eb14312bc..24ef6ef53 100644 --- a/package/meson/src/cross-compilation.conf.in +++ b/package/meson/src/cross-compilation.conf.in @@ -8,13 +8,15 @@ 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' -[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] |