From cf2ad9995aa076b17024a76344d1f3580ea7b4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 20 Feb 2023 18:51:37 +0700 Subject: GetPrerequisites: Ignore relative paths printed by ldd On x86 Linux, the ldd output for its vDSO (linux-gate.so.1) is a bit different from other Linux with standard vDSO name (linux-vdso.so.1). $ ldd /bin/ls linux-gate.so.1 => linux-gate.so.1 (0xf7f5e000) libcap.so.2 => /usr/lib32/libcap.so.2 (0xf7f22000) libc.so.6 => /usr/lib32/libc.so.6 (0xf7cfb000) /lib/ld-linux.so.2 => /usr/lib32/ld-linux.so.2 (0xf7f60000) This fixes the `Tests/BundleUtilities` test on x86 Linux. --- Modules/GetPrerequisites.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index 0ba35b6..0cd49ab 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -730,7 +730,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa 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_cmp_count 1) -- cgit v0.12