[gentoo-dev] [PATCH] meson.eclass: fix machine files

[gentoo-dev] [PATCH] meson.eclass: fix machine files

[William Hubbs]

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

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

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 21338280df3..a02e94c7a01 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -185,7 +185,7 @@ _meson_create_cross_file() {
 	strip = $(_meson_env_array "$(tc-getSTRIP)")
 	windres = $(_meson_env_array "$(tc-getRC)")
 
-	[properties]
+	[built-in options]
 	c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
 	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
 	cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
@@ -236,7 +236,7 @@ _meson_create_native_file() {
 	strip = $(_meson_env_array "$(tc-getBUILD_STRIP)")
 	windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)")
 
-	[properties]
+	[built-in 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

[gentoo-dev] Re: [PATCH] meson.eclass: fix machine files

[Mike Gilbert]

On Sun, Aug 30, 2020 at 4:06 PM William Hubbs <williamh@gentoo.org> wrote:
>
> Several options we were setting in the [properties] section of the
> machine files have been moved to the [built-in options] section.

What version of meson introduced "built-in options"? I imagine we will
need to keep the properties around until a new enough version of meson
is stable.

[gentoo-dev] Re: [PATCH] meson.eclass: fix machine files

[William Hubbs]

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

On Sun, Aug 30, 2020 at 05:36:32PM -0400, Mike Gilbert wrote:
> On Sun, Aug 30, 2020 at 4:06 PM William Hubbs <williamh@gentoo.org> wrote:
> >
> > Several options we were setting in the [properties] section of the
> > machine files have been moved to the [built-in options] section.
> 
> What version of meson introduced "built-in options"? I imagine we will
> need to keep the properties around until a new enough version of meson
> is stable.

It looks like we'll need to wait for 0.56.x to be released before we can
do this.

Thanks,

William


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]