From cce174e668761ef3c9c7895f804c81a4e578c66c Mon Sep 17 00:00:00 2001
From: William Hubbs <williamh@gentoo.org>
Date: Sun, 30 Aug 2020 14:25:31 -0500
Subject: [PATCH] profiles/eclass/meson.eclass: fix machine files

Several options we were setting in the [properties] section of the
machine files have been moved to the [built-in options] section in
meson 0.56.

Closes: https://bugs.gentoo.org/738710
Signed-off-by: William Hubbs <williamh@gentoo.org>
---
 eclass/meson.eclass | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 67b7ca831fd..34098645ac6 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -159,7 +159,18 @@ _meson_create_cross_file() {
 	_meson_get_machine_info "${CHOST}"
 
 	local fn=${T}/meson.${CHOST}.${ABI}.ini
+	local options
 
+	local ver_opt
+	case "${EAPI}" in
+		6) ver_opt=--host-route ;;
+		*) ver_opt=-b ;;
+	esac
+	if has_version "${ver_opt}" '<dev-util/meson-0.56.0'; then
+		options="[properties]"
+	else
+		options="[built-in options]"
+	fi
 	cat > "${fn}" <<-EOF
 	[binaries]
 	ar = $(_meson_env_array "$(tc-getAR)")
@@ -174,7 +185,7 @@ _meson_create_cross_file() {
 	strip = $(_meson_env_array "$(tc-getSTRIP)")
 	windres = $(_meson_env_array "$(tc-getRC)")
 
-	[properties]
+	${options}
 	c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
 	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
 	cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
@@ -210,7 +221,18 @@ _meson_create_native_file() {
 	_meson_get_machine_info "${CBUILD}"
 
 	local fn=${T}/meson.${CBUILD}.${ABI}.ini
+	local options
 
+	local ver_opt
+	case "${EAPI}" in
+		6) ver_opt=--host-route ;;
+		*) ver_opt=-b ;;
+	esac
+	if has_version "${ver_opt}" '<dev-util/meson-0.56.0'; then
+		options="[properties]"
+	else
+		options="[built-in options]"
+	fi
 	cat > "${fn}" <<-EOF
 	[binaries]
 	ar = $(_meson_env_array "$(tc-getBUILD_AR)")
@@ -225,7 +247,7 @@ _meson_create_native_file() {
 	strip = $(_meson_env_array "$(tc-getBUILD_STRIP)")
 	windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)")
 
-	[properties]
+	${options}
 	c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}")
 	c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}")
 	cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}")
-- 
2.26.2