diff options
Diffstat (limited to 'package/meson')
| -rw-r--r-- | package/meson/Makefile | 14 | ||||
| -rw-r--r-- | package/meson/src/cross-compilation.conf.in | 8 | ||||
| -rw-r--r-- | package/meson/src/host-compilation.conf.in | 12 |
3 files changed, 29 insertions, 5 deletions
diff --git a/package/meson/Makefile b/package/meson/Makefile index d16d450e0..314fac6dc 100644 --- a/package/meson/Makefile +++ b/package/meson/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= meson -PKG_VERSION:= 0.44.0 +PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 5cdbc68c63b5b4a8ee862ab3b6393a2633487ebc9b3e1c3da1091b9c912d1d95 +PKG_HASH:= 683082fb3c5cddf203b21d29bdf4c227e2f7964da5324a15e1a5f7db94322b4b PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= python3-host ninja-host @@ -35,12 +35,20 @@ meson-hostinstall: -e "s%@TARGET_ARCH@%$(ADK_TARGET_ARCH)%g" \ -e "s%@TARGET_CPU@%$(ADK_TARGET_CPU_ARCH)%g" \ -e "s%@TARGET_ENDIAN@%$(ADK_TARGET_ENDIAN)%g" \ - -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \ + -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \ -e "s%@TARGET_LDFLAGS@%`printf '"%s", ' $(TARGET_LDFLAGS)`%g" \ -e "s%@TARGET_CXXFLAGS@%`printf '"%s", ' $(TARGET_CXXFLAGS)`%g" \ -e "s%@STAGING_HOST_DIR@%$(STAGING_HOST_DIR)%g" \ $(WRKBUILD)/cross-compilation.conf.in \ > $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf + sed -i "s/\"/'/g" $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf + sed -e "s%@HOST_CFLAGS@%`printf '"%s", ' $(HOST_CFLAGS)`%g" \ + -e "s%@HOST_LDFLAGS@%`printf '"%s", ' $(HOST_LDFLAGS)`%g" \ + -e "s%@HOST_CXXFLAGS@%`printf '"%s", ' $(HOST_CXXFLAGS)`%g" \ + -e "s%@STAGING_HOST_DIR@%$(STAGING_HOST_DIR)%g" \ + $(WRKBUILD)/host-compilation.conf.in \ + > $(STAGING_HOST_DIR)/etc/meson/host-compilation.conf + sed -i "s/\"/'/g" $(STAGING_HOST_DIR)/etc/meson/host-compilation.conf include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/meson/src/cross-compilation.conf.in b/package/meson/src/cross-compilation.conf.in index a636ca329..24ef6ef53 100644 --- a/package/meson/src/cross-compilation.conf.in +++ b/package/meson/src/cross-compilation.conf.in @@ -8,12 +8,16 @@ c = '@TARGET_CROSS@gcc' cpp = '@TARGET_CROSS@g++' ar = '@TARGET_CROSS@ar' strip = '@TARGET_CROSS@strip' -pkgconfig = '@STAGING_HOST_DIR@/usr/bin/pkg-config' -[properties] +pkg-config = '@STAGING_HOST_DIR@/usr/bin/pkg-config' + +[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] system = 'linux' diff --git a/package/meson/src/host-compilation.conf.in b/package/meson/src/host-compilation.conf.in new file mode 100644 index 000000000..c67cec76e --- /dev/null +++ b/package/meson/src/host-compilation.conf.in @@ -0,0 +1,12 @@ +# Note: OpenADK's and Meson's terminologies differ about the meaning +# of 'build', 'host' and 'target': +# - OpenADK's 'host' is Meson's 'build' +# - OpenADK's 'target' is Meson's 'host' + +[binaries] +pkgconfig = '@STAGING_HOST_DIR@/usr/bin/pkg-config' +[properties] +c_args = [@HOST_CFLAGS@] +c_link_args = [@HOST_LDFLAGS@] +cpp_args = [@HOST_CXXFLAGS@] +cpp_link_args = [@HOST_LDFLAGS@] |