From da3833fe8584affec23371b5e7b1c529c980df551c24f0b9258774282eb9844a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 24 Aug 2022 09:45:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=504 --- glibc-236.patch | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/glibc-236.patch b/glibc-236.patch index 69a7839..fa94353 100644 --- a/glibc-236.patch +++ b/glibc-236.patch @@ -2,12 +2,15 @@ investigated under https://gitlab.kitware.com/cmake/cmake/-/issues/23881 --- cmake-3.24.1/Modules/GetPrerequisites.cmake +++ cmake-3.24.1/Modules/GetPrerequisites.cmake -@@ -514,7 +514,7 @@ - string(TOLOWER "${resolved_file}" lower) - - if(UNIX) -- if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/)") -+ if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/|linux-vdso\\.so)") - set(is_system 1) - endif() - endif() +@@ -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")