From efbc7799b55b6654c52bd7b445813805542f9365 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 7 Sep 2023 09:21:19 +0200 Subject: [PATCH] installer/portable: include libbrotlienc As of brotli 1.1.0, it seems that the `brotli` executable depends on that library. And since we include that executable, we need to include that library, too. An alternative would be to kick out that executable, as it is _probably_ not required for libcurl to work (which is the only user of brotli in Git for Windows). But that would be fragile (what if the analysis is incomplete and the executable _is_ required, in corner cases?) and the library only weighs ~64 kilobyte anyway, so let's go the robust and easy route. Signed-off-by: Johannes Schindelin --- make-file-list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-file-list.sh b/make-file-list.sh index 7a94fc9168..364cc5279e 100755 --- a/make-file-list.sh +++ b/make-file-list.sh @@ -213,7 +213,7 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \ -e '^/\(mingw\|clang\)[^/]*/itcl/' \ -e '^/\(mingw\|clang\)[^/]*/t\(cl\|k\)[^/]*/\(demos\|msgs\|encoding\|tzdata\)/' \ -e '^/\(mingw\|clang\)[^/]*/bin/\(autopoint\|[a-z]*-config\)$' \ - -e '^/\(mingw\|clang\)[^/]*/bin/lib\(asprintf\|brotlienc\|gettext\|gnutls\|gnutlsxx\|gmpxx\|pcre[013-9a-oq-z]\|pcre2-[13p]\|quadmath\|stdc++\|zip\)[^/]*\.dll$' \ + -e '^/\(mingw\|clang\)[^/]*/bin/lib\(asprintf\|gettext\|gnutls\|gnutlsxx\|gmpxx\|pcre[013-9a-oq-z]\|pcre2-[13p]\|quadmath\|stdc++\|zip\)[^/]*\.dll$' \ -e '^/\(mingw\|clang\)[^/]*/bin/lib\(atomic\|charset\|gomp\|systre'"$EXCLUDE_LIBSSP"'\)-[0-9]*\.dll$' \ -e '^/\(mingw\|clang\)[^/]*/bin/\(asn1\|gnutls\|idn\|mini\|msg\|nettle\|ngettext\|ocsp\|pcre\|rtmp\|xgettext\|zip\)[^/]*\.exe$' \ -e '^/\(mingw\|clang\)[^/]*/bin/recode-sr-latin.exe$' \