make-file-list: work around 32-bit issues more surgically

As of 6f92a0e (make-file-list: work around 32-bit issues, 2020-10-15),
we worked around a discrepancy between i686 and x86_64 variants of the
`apr` and the `file` package, excluding dependencies specifically for
i686 variants.

However, yesterday's big sync removed those discrepancies.

Let's use a `grep` invocation that is as straight-forward as it is hacky
as an indicator whether or not to special-case these dependencies in the
i686 case.

All of this is really only needed for this one last time when Git for
Windows v2.48.1 will ship with an i686 installer and portable Git;
Future versions of Git for Windows will only ship MinGit for that CPU
architecture, which does not have that problem.

Note that we also have to adjust the `please.sh create-sdk-artifact
build-installers` command for that hack to work there.

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

Author: dscho

make-file-list.sh

@@ -187,6 +187,13 @@ then
 		mingw-w64-$PACMAN_ARCH-antiword mingw-w64-$PACMAN_ARCH-odt2txt ssh-pageant
 		mingw-w64-$PACMAN_ARCH-git-lfs mingw-w64-$PACMAN_ARCH-xz tig $GIT_UPDATE_EXTRA_PACKAGES"
 fi
+
+I686_EXCLUDE=
+if test i686 = "$ARCH" && ! grep msys-uuid-1 /usr/bin/msys-apr-1-0.dll 2>&1 >/dev/null
+then
+	I686_EXCLUDE='uuid\|lzma\|'
+fi
+
 pacman_list $packages "$@" |
 
 grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
@@ -234,10 +241,7 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
 	-e '^/\(mingw\|clang\)[^/]*/share/gtk-doc/' \
 	-e '^/\(mingw\|clang\)[^/]*/share/nghttp2/' \
 	-e '^/usr/bin/msys-\(db\|curl\|icu\|gfortran\|stdc++\|quadmath\)[^/]*\.dll$' \
-	-e '^/usr/bin/msys-\('$(if test i686 = "$ARCH"
-	    then
-		echo 'uuid\|lzma\|'
-	    fi)'fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|xml2\|xslt\|exslt\)-.*\.dll$' \
+	-e '^/usr/bin/msys-\('"$I686_EXCLUDE"'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\|ssh2\|kafs\)-.*\.dll$' \
 	-e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*\|\)\.dll$' \

please.sh

@@ -3255,6 +3255,9 @@ create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--archit
 		/usr/bin/msys-pcre*.dll
 		/usr/bin/msys-gcc_s-*.dll
 
+		# For the libuuid check
+		/usr/bin/msys-apr*.dll
+
 		# markdown, to render the release notes
 		/usr/bin/markdown