commit:     c1699972024a11b679220d75b43f884f8f58d813
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 11:47:04 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 13:17:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1699972

cmake.eclass: Merge mycmakeargs description into cmake_src_configure()

Fix outdated mycmakeargs documentation (use of banned function in EAPI-7)
Make it a part of phase function desc than instead of appearing under FUNCTIONS.

Reported-by: Joonas Niilola <juippis <AT> gentoo.org>
Closes: https://bugs.gentoo.org/771876
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 62fa0271570..649e447d7e1 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cmake.eclass
@@ -358,25 +358,20 @@ cmake_src_prepare() {
        _CMAKE_SRC_PREPARE_HAS_RUN=1
 }
 
-# @VARIABLE: mycmakeargs
-# @DEFAULT_UNSET
+# @FUNCTION: cmake_src_configure
 # @DESCRIPTION:
-# Optional cmake defines as a bash array. Should be defined before calling
-# src_configure.
+# General function for configuring with cmake. Default behaviour is to start an
+# out-of-source build.
+# Passes arguments to cmake by reading from an optionally pre-defined local
+# mycmakeargs bash array.
 # @CODE
 # src_configure() {
 #      local mycmakeargs=(
-#              $(cmake_use_with openconnect)
+#              $(cmake_use_find_package foo LibFoo)
 #      )
-#
 #      cmake_src_configure
 # }
 # @CODE
-
-# @FUNCTION: cmake_src_configure
-# @DESCRIPTION:
-# General function for configuring with cmake. Default behaviour is to start an
-# out-of-source build.
 cmake_src_configure() {
        debug-print-function ${FUNCNAME} "$@"
 

Reply via email to