[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b564d03e0dad824e6dabeaa1136351c26fd964e9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  1 12:24:33 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 16 19:00:14 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b564d03e

cmake.eclass: Wipe default optimization flags unconditionally

Mark CMAKE_BUILD_TYPE=Gentoo as no-op. This was obsolete a long time ago,
the last two ebuilds setting it in ::gentoo were not using it for that
purpose either and were since fixed.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 1c57b8ead962..d865c85d8c7f 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -165,6 +165,13 @@ _CMAKE_MINREQVER_CMAKE316=()
 # @DESCRIPTION:
 # Array of tests that should be skipped when running CTest.
 
+case ${CMAKE_BUILD_TYPE} in
+       Gentoo)
+               ewarn "\${CMAKE_BUILD_TYPE} \"Gentoo\" is a no-op. Default is 
RelWithDebInfo."
+               ;;
+       *) ;;
+esac
+
 case ${CMAKE_ECM_MODE} in
        auto|true|false) ;;
        *)
@@ -652,20 +659,18 @@ cmake_src_configure() {
        fi
 
        # Wipe the default optimization flags out of CMake
-       if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]]; then
-               cat >> ${common_config} <<- _EOF_ || die
-                       set(CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE 
STRING "")
-                       set(CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE 
STRING "")
-                       set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING 
"")
-                       set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE 
STRING "")
-                       set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE 
STRING "")
-                       set(CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" 
CACHE STRING "")
-                       set(CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" 
CACHE STRING "")
-                       set(CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" 
CACHE STRING "")
-                       set(CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" 
CACHE STRING "")
-                       set(CMAKE_INSTALL_ALWAYS 1) # see Gentoo-bug 735820
-               _EOF_
-       fi
+       cat >> ${common_config} <<- _EOF_ || die
+               set(CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+               set(CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING 
"")
+               set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+               set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+               set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING 
"")
+               set(CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE 
STRING "")
+               set(CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE 
STRING "")
+               set(CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE 
STRING "")
+               set(CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE 
STRING "")
+               set(CMAKE_INSTALL_ALWAYS 1) # see Gentoo-bug 735820
+       _EOF_
 
        # Make the array a local variable since <=portage-2.1.6.x does not 
support
        # global arrays (see bug #297255). But first make sure it is 
initialised.