1.1 --- a/scripts/xldd.in Sun Jul 10 23:37:58 2011 +0200
1.2 +++ b/scripts/xldd.in Mon Jul 11 00:13:57 2011 +0200
1.3 @@ -243,6 +243,8 @@
1.4 else
1.5 printf "%8s%s not found\n" "" "${needed}"
1.6 fi
1.7 +
1.8 + do_trace "Done searching for '${needed}'\n"
1.9 }
1.10
1.11 # Scan a file for all NEEDED tags
1.12 @@ -266,6 +268,7 @@
1.13 for n in "${search_rpath[@]}" "${needed_search_path[@]}"; do
1.14 do_trace ": - '${n}'\n"
1.15 done
1.16 + do_trace ": end search path"
1.17
1.18 for n in $( "${readelf}" -d "${file}" \
1.19 |"${grep}" -E '\(NEEDED\)' \
1.20 @@ -282,9 +285,12 @@
1.21 do_trace "-> handling new dependency '${n}'\n"
1.22 needed_list+=( "${n}" )
1.23 do_find_needed "${n}"
1.24 + do_trace "-> done handling dependency '${n}'\n"
1.25 done
1.26
1.27 search_rpath=( "${save_search_rpath[@]}" )
1.28 +
1.29 + do_trace "Finished parsing file '${file}'\n"
1.30 }
1.31
1.32 # Recursively scan a /etc/ld.so.conf file
1.33 @@ -304,6 +310,7 @@
1.34 for f in ${g}; do
1.35 do_scan_etc_ldsoconf "${f}"
1.36 done
1.37 + do_trace "-> finished handling include directive '${g}'\n"
1.38 ;;
1.39 \#*|"")
1.40 ;;
1.41 @@ -313,6 +320,8 @@
1.42 ;;
1.43 esac
1.44 done <"${ldsoconf}"
1.45 +
1.46 + do_trace "Finished parsing ld.so.conf: '${ldsoconf}'\n"
1.47 }
1.48
1.49 # Build up the full list of search directories
1.50 @@ -327,14 +336,17 @@
1.51 fi
1.52 ld_library_path="${ld_library_path#*:}"
1.53 done
1.54 +do_trace "Done adding basic lib dirs\n"
1.55 do_trace "Scanning '/etc/ld.so.conf'\n"
1.56 do_scan_etc_ldsoconf "${root}/etc/ld.so.conf"
1.57 +do_trace "Done scanning '/etc/ld.so.conf'\n"
1.58 do_trace "Search path:\n"
1.59 for p in "${needed_search_path[@]}"; do
1.60 do_trace "-> '${p}'\n"
1.61 done
1.62
1.63 -do_trace "Scanning file '${1}'\n"
1.64 declare -a needed_list
1.65 declare -a search_rpath
1.66 +do_trace "Scanning file '${1}'\n"
1.67 do_process_file "${1}"
1.68 +do_trace "Done scanning file '${1}'\n"