Skip to content

Commit c9f04bb

Browse files
committed
make-file-list: stop being confused by >=<ver> in the pactree output
As of yesterday's sync of the i686 packages in MSYS2, `mingw-w64-p11-kit` is listed with a `>=0.23.1` requirement. This confused the `make-file-list.sh` script when it specifically wanted to exclude `mingw-w64-p11-kit`'s files from being bundled. Unbeknownst to me, this `>=` mishandling hid _another_ bug: `mingw-w64-p11-kit>=0.23.1` is listed in the `git-sdk-64` repository as a dependency of `mingw-w64-gnutls`, and that allowed it to slip through the cracks and actually get included in 64-bit versions of Git for Windows! This finally also explains, at long last, the conundrum that puzzled me so much in b7729d4 (make-file-list: do include p11-kit's dependencies, 2022-07-08) where the libffi/libtasn1 dependencies were needed in git-sdk-64 but not in git-sdk-32: In 32-bit Git for Windows, `/mingw32/bin/p11-kit.exe` was excluded but in 64-bit Git for Windows `/mingw64/bin/p11-kit.exe` was included! Let's make things consistent again and just ship the MINGW variant of p11-kit in regular Git for Windows (but still omit it in MinGit). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent b7838c4 commit c9f04bb

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

make-file-list.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ aarch64)
2727
esac
2828

2929
SH_FOR_REBASE=dash
30-
PACKAGE_EXCLUDES="db info heimdal tcl git util-linux curl git-for-windows-keyring
31-
mingw-w64-p11-kit"
30+
PACKAGE_EXCLUDES="db info heimdal tcl git util-linux curl git-for-windows-keyring"
3231
EXTRA_FILE_EXCLUDES=
3332
UTIL_PACKAGES="sed awk grep findutils coreutils"
3433
if test -n "$MINIMAL_GIT_WITH_BUSYBOX"
@@ -49,7 +48,7 @@ fi
4948
if test -n "$MINIMAL_GIT"
5049
then
5150
PACKAGE_EXCLUDES="$PACKAGE_EXCLUDES mingw-w64-bzip2 mingw-w64-c-ares
52-
mingw-w64-libsystre mingw-w64-libtre-git
51+
mingw-w64-libsystre mingw-w64-libtre-git mingw-w64-p11-kit
5352
mingw-w64-tcl mingw-w64-tk mingw-w64-wineditline gdbm icu libdb
5453
libedit libgdbm perl perl-.*"
5554
fi
@@ -108,6 +107,7 @@ pacman_list () {
108107
do
109108
pactree -u "$arg"
110109
done |
110+
sed 's/>.*//' |
111111
grep -v "^\\($(echo $PACKAGE_EXCLUDES | sed \
112112
-e 's/ /\\|/g' \
113113
-e 's/mingw-w64-/&\\(i686\\|x86_64\\|clang-aarch64\\)-/g')\\)\$" |
@@ -210,7 +210,6 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
210210
-e '^/usr/include/' -e '^/\(mingw\|clang\)[^/]*/include/' \
211211
-e '^/usr/share/doc/' \
212212
-e '^/usr/share/info/' -e '^/\(mingw\|clang\)[^/]*/share/info/' \
213-
-e '^/mingw32/bin/lib\(ffi\|tasn1\)-.*\.dll$' \
214213
-e '^/\(mingw\|clang\)[^/]*/share/git-doc/technical/' \
215214
-e '^/\(mingw\|clang\)[^/]*/lib/cmake/' \
216215
-e '^/\(mingw\|clang\)[^/]*/itcl/' \

0 commit comments

Comments
 (0)