diff --git a/cmake.changes b/cmake.changes index 8111da6..e091a3b 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 23 15:05:13 UTC 2022 - Dirk Müller + +- add glibc-236.patch (bsc#1202208) + ------------------------------------------------------------------- Thu Aug 18 09:04:40 UTC 2022 - Paolo Stivanin diff --git a/cmake.spec b/cmake.spec index ce527df..1d73d26 100644 --- a/cmake.spec +++ b/cmake.spec @@ -64,6 +64,7 @@ Patch0: cmake-fix-ruby-test.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch Patch2: cmake-fix-png-include-dir.patch +Patch3: glibc-236.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/glibc-236.patch b/glibc-236.patch new file mode 100644 index 0000000..fa94353 --- /dev/null +++ b/glibc-236.patch @@ -0,0 +1,16 @@ +investigated under https://gitlab.kitware.com/cmake/cmake/-/issues/23881 + +--- cmake-3.24.1/Modules/GetPrerequisites.cmake ++++ cmake-3.24.1/Modules/GetPrerequisites.cmake +@@ -730,9 +730,9 @@ function(get_prerequisites target prereq + + if(gp_tool MATCHES "ldd$") + set(gp_cmd_args "") +- set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+([^\t\(]+)( \(.+\))?${eol_char}$") ++ set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+(/[^\t\(]+)( \(.+\))?${eol_char}$") + set(gp_regex_error "not found${eol_char}$") +- set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$") ++ set(gp_regex_fallback "^[\t ]*([^\t ]+) => (/[^\t ]+).*${eol_char}$") + set(gp_regex_cmp_count 1) + elseif(gp_tool MATCHES "otool$") + set(gp_cmd_args "-L")