SHA256
3
0
forked from pool/cmake
Dirk Mueller 2022-08-24 09:45:56 +00:00 committed by Git OBS Bridge
parent fb770b7cbd
commit da3833fe85

View File

@ -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)
@@ -730,9 +730,9 @@ function(get_prerequisites target prereq
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()
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")