From 858ca5fb9038d9901ed1fc489f247aac7b67e569 Mon Sep 17 00:00:00 2001 From: Boud Roukema Date: Wed, 26 Feb 2025 02:14:47 +0100 Subject: Configuration: more portable /bin/sh derivation of linked libraries Summary: this will not affect the analysis of any project. Until this commit, the part of the configuration script which would check for the necessary host libraries used by the host shell was not portable (would not work on some systems). Also, the list of paths had an extra ':' at the end (allowing the searching of the running directory for libraries, which is a bug and can have unpredictable effects). With this commit, both issues have been addressed in the configuration script. --- reproduce/software/shell/configure.sh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'reproduce/software') diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh index 83bf4ed..517e1ed 100755 --- a/reproduce/software/shell/configure.sh +++ b/reproduce/software/shell/configure.sh @@ -1590,20 +1590,37 @@ fi # cause a crash! To avoid such cases, we need to find the locations of the # libraries that the shell needs and temporarily add them to the library # search path. +# +# About the 'grep -v "(0x[^)]*)"' term (from bug 66847, see [1]): On some +# systems [2], the output of 'ldd /bin/sh' includes a line for the vDSO [3] +# that is different to the formats that are assumed, prior to this commit, +# by the algorithm in 'configure.sh' when evaluating the variable +# 'sys_library_sh_path'. This leads to a fatal syntax error in (at least) +# 'ncurses', because the option using 'sys_library_sh_path' contains an +# unquoted RAM address in parentheses. Even if the address were quoted, it +# would still be incorrect. This 'grep command excludes candidate host path +# strings that look like RAM addresses to address the problem. +# +# [1] https://savannah.nongnu.org/bugs/index.php?66847 +# [2] https://stackoverflow.com/questions/34428037/how-to-interpret-the-output-of-the-ldd-program +# [3] man vdso if [ x"$on_mac_os" = xyes ]; then sys_library_sh_path=$(otool -L /bin/sh \ | awk '/\/lib/{print $1}' \ | sed 's#/[^/]*$##' \ | sort \ | uniq \ - | awk '{printf "%s:", $1}END{printf "\b"}') + | awk '{if (NR==1) printf "%s", $1; \ + else printf ":%s", $1}') else sys_library_sh_path=$(ldd /bin/sh \ | awk '{if($3!="") print $3}' \ | sed 's#/[^/]*$##' \ + | grep -v "(0x[^)]*)" \ | sort \ | uniq \ - | awk '{printf "%s:", $1}END{printf "\b"}') + | awk '{if (NR==1) printf "%s", $1; \ + else printf ":%s", $1}') fi -- cgit v1.2.1