Gentoo Archives: gentoo-dev

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH] cmake.eclass: Fix MYCMAKEARGS breakage with >=dev-util/cmake-3.23
Date: Wed, 16 Feb 2022 17:58:53
Message-Id: 2181564.vFx2qVVIhK@tuxbrain
1 I'm not sure what this variable is about, but we gotta fix it.
2
3 ...and rather drop on next EAPI bump.
4
5 Bug: https://bugs.gentoo.org/833100
6 Signed-off-by: Andreas Sturmlechner <asturm@g.o>
7 ---
8 eclass/cmake.eclass | 5 ++++-
9 1 file changed, 4 insertions(+), 1 deletion(-)
10
11 diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
12 index 36f2621e19..64a2931898 100644
13 --- a/eclass/cmake.eclass
14 +++ b/eclass/cmake.eclass
15 @@ -593,9 +593,12 @@ cmake_src_configure() {
16 "${mycmakeargs_local[@]}"
17 -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
18 -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
19 - "${MYCMAKEARGS}"
20 )
21
22 + if [[ -n ${MYCMAKEARGS} ]] ; then
23 + cmakeargs+=( "${MYCMAKEARGS}" )
24 + fi
25 +
26 if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then
27 cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
28 fi
29 --
30 2.35.1

Attachments

File name MIME type
signature.asc application/pgp-signature

Replies