Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 682333 Details for
Bug 738710
meson.eclass - future releases of meson require changes
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
0001-meson.eclass-fix-machine-files.patch
0001-meson.eclass-fix-machine-files.patch (text/plain), 2.08 KB, created by
William Hubbs
on 2021-01-11 06:32:06 UTC
(
hide
)
Description:
0001-meson.eclass-fix-machine-files.patch
Filename:
MIME Type:
Creator:
William Hubbs
Created:
2021-01-11 06:32:06 UTC
Size:
2.08 KB
patch
obsolete
>From e58fd1852307325ee679e5171ec997631d7c0014 Mon Sep 17 00:00:00 2001 >From: William Hubbs <williamh@gentoo.org> >Date: Sun, 30 Aug 2020 14:25:31 -0500 >Subject: [PATCH] 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. > >Closes: https://bugs.gentoo.org/738710 >Signed-off-by: William Hubbs <williamh@gentoo.org> >--- > eclass/meson.eclass | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > >diff --git a/eclass/meson.eclass b/eclass/meson.eclass >index 67b7ca831fd..ec8f4d20941 100644 >--- a/eclass/meson.eclass >+++ b/eclass/meson.eclass >@@ -159,7 +159,13 @@ _meson_create_cross_file() { > _meson_get_machine_info "${CHOST}" > > local fn=${T}/meson.${CHOST}.${ABI}.ini >+ local options > >+ if has_version '<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 +180,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 +216,13 @@ _meson_create_native_file() { > _meson_get_machine_info "${CBUILD}" > > local fn=${T}/meson.${CBUILD}.${ABI}.ini >+ local options > >+ if has_version '<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 +237,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 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 738710
:
682330
|
682333
|
682465
|
682468
|
710328