Merge branch 'check-for-missing-dlls-i686'

This topic branch fixes the `check-for-missing-dlls.sh` script so that
it works correctly in the 32-bit SDK of Git for Windows.

If we had had this, and had hooked it up in an Azure Pipeline, we would
have caught the problem much earlier where `gpg.exe` stopped working
because of a `libnettle` upgrade that broke the dependency chain of
`msys-gnutls-30.dll`.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

check-for-missing-dlls.sh

@@ -31,7 +31,8 @@ else
 fi
 
 used_dlls_file=/tmp/used-dlls.$$.txt
-trap "rm \"$used_dlls_file\"" EXIT
+tmp_file=/tmp/tmp.$$.txt
+trap "rm \"$used_dlls_file\" \"$tmp_file\"" EXIT
 
 all_files="$(export ARCH BITNESS && "$thisdir"/make-file-list.sh | tr A-Z a-z)" &&
 usr_bin_dlls="$(echo "$all_files" | grep '^usr/bin/[^/]*\.dll$')" &&
@@ -42,14 +43,21 @@ do
 	printf "dir: $dir$next_line\\r" >&2
 
 	case "$dir" in
-	usr/*) dlls="$dlls$LF$usr_bin_dlls$LF";;
-	mingw$BITNESS/*) dlls="$dlls$LF$mingw_bin_dlls$LF";;
+	usr/*) dlls="$sys_dlls$LF$usr_bin_dlls$LF";;
+	mingw$BITNESS/*) dlls="$sys_dlls$LF$mingw_bin_dlls$LF";;
 	*) dlls="$sys_dlls$LF";;
 	esac
 
-	/usr/bin/objdump -p $(echo "$all_files" | sed -ne 's,[][],\\&,g' -e "s,^$dir[^/]*\.\(dll\|exe\)$,/&,p") |
+	paths=$(echo "$all_files" |
+		sed -ne 's,[][],\\&,g' -e "s,^$dir[^/]*\.\(dll\|exe\)$,/&,p")
+	out="$(/usr/bin/objdump -p $paths 2>"$tmp_file")"
+	paths="$(sed -n 's|^/usr/bin/objdump: \([^ :]*\): file format not recognized|\1|p' <"$tmp_file")"
+	test -z "$paths" ||
+	out="$out$LF$(ldd $paths)"
+
+	echo "$out" |
 	tr A-Z\\r a-z\  |
-	grep -e '^.dll name:' -e '^[^ ]*\.\(dll\|exe\):' |
+	grep -e '^.dll name:' -e '^[^ ]*\.\(dll\|exe\):' -e '\.dll =>' |
 	while read a b c d
 	do
 		case "$a,$b" in

make-file-list.sh

@@ -164,7 +164,12 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
 	-e '^/mingw../share/git\(k\|-gui\)/lib/msgs/' \
 	-e '^/mingw../share/nghttp2/' \
 	-e '^/usr/bin/msys-\(db\|curl\|icu\|gfortran\|stdc++\|quadmath\)[^/]*\.dll$' \
-	-e '^/usr/bin/msys-\(fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|lzma\|xml2\|xslt\|exslt\)-.*\.dll$' \
+	-e '^/usr/bin/msys-\('$(if test i686 = "$ARCH"
+	    then
+		echo 'uuid\|'
+	    else
+		echo 'lzma\|'
+	    fi)'fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|xml2\|xslt\|exslt\)-.*\.dll$' \
 	-e '^/usr/bin/msys-\(hdb\|history8\|kadm5\|kdc\|otp\|sl\).*\.dll$' \
 	-e '^/usr/bin/msys-\(atomic\|blkid\|charset\|gthread\|metalink\|nghttp2\|pcre2-8\|ssh2\)-.*\.dll$' \
 	-e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*\|\)\.dll$' \