From: Andreas Sturmlechner Date: Sun, 19 May 2019 16:15:29 +0000 (+0200) Subject: cmake-utils.eclass: _cmake_modify-cmakelists: Fix CMAKE_BUILD_TYPE sed X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b5582636d219284037ee65bc427194d7e969c4b;p=gentoo.git cmake-utils.eclass: _cmake_modify-cmakelists: Fix CMAKE_BUILD_TYPE sed Commit 6b7998b narrowed matching CMAKE_BUILD_TYPE too successfully and led to a string like `set(CMAKE_BUILD_TYPE)` being left over. Bug: https://bugs.gentoo.org/674768 Closes: https://bugs.gentoo.org/686266 Signed-off-by: Andreas Sturmlechner --- diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 28dac7e0a0b4..ea1858e9735f 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -420,7 +420,7 @@ _cmake_modify-cmakelists() { # Comment out all set ( value) find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec sed \ - -e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \ + -e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE\([[:space:]].*)\|)\)/I{s/^/#_cmake_modify_IGNORE /g}' \ -e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \ -e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \ -e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \