diff --git a/check-for-missing-dlls.sh b/check-for-missing-dlls.sh index d4655c1e4c..7bfd27be4e 100644 --- a/check-for-missing-dlls.sh +++ b/check-for-missing-dlls.sh @@ -123,7 +123,7 @@ grep '\.dll$' "$tmp_file.all" | -e '^usr/lib/sasl2/' \ -e '^usr/lib/coreutils/libstdbuf.dll' \ -e '^mingw../bin/libcurl\(\|-openssl\)-4.dll' \ - -e '^mingw../bin/\(atlassian\|azuredevops\|bitbucket\|gcmcore.*\|github\|gitlab\|microsoft\|newtonsoft\|system\..*\|webview2loader\|avalonia\|.*harfbuzzsharp\|microcom\|.*skiasharp\|av_libglesv2\|msalruntime_x86\)\.' \ + -e '^mingw../bin/\(atlassian\|azuredevops\|bitbucket\|gcmcore.*\|github\|gitlab\|microsoft\|newtonsoft\|system\..*\|webview2loader\|avalonia\|.*harfbuzzsharp\|microcom\|.*skiasharp\|av_libglesv2\|msalruntime\(\|_x86\|arm64\)\)\.' \ -e '^mingw../lib/ossl-modules/' \ -e '^mingw../lib/\(engines\|reg\|thread\)' | sed 's/^/unused dll: /' | diff --git a/make-file-list.sh b/make-file-list.sh index 45129542bd..9386ea6f9d 100755 --- a/make-file-list.sh +++ b/make-file-list.sh @@ -50,7 +50,8 @@ then PACKAGE_EXCLUDES="$PACKAGE_EXCLUDES mingw-w64-bzip2 mingw-w64-c-ares mingw-w64-libsystre mingw-w64-libtre-git mingw-w64-p11-kit mingw-w64-tcl mingw-w64-tk mingw-w64-wineditline gdbm icu libdb - libedit libgdbm perl perl-.* mingw-w64-tzdata" + libedit libgdbm perl perl-.* mingw-w64-tzdata + mingw-w64-git-svn subversion libserf apr apr-util expat libexpat liblz4" fi if test -z "$INCLUDE_GIT_UPDATE" then @@ -347,7 +348,7 @@ else -e '^/usr/bin/\(stty\|sum\|sync\|tac\|tee\|timeout\)\.exe$' \ -e '^/usr/bin/\(truncate\|tsort\|tty\|tzset\|umount\)\.exe$' \ -e '^/usr/bin/\(unexpand\|unlink\|users\|vdir\|who.*\)\.exe$' \ - -e '^/usr/bin/msys-\(cilkrts\|ssl\)-.*\.dll$' \ + -e '^/usr/bin/msys-\(cilkrts\|ssl\|uuid\)-.*\.dll$' \ -e '^/usr/bin/msys-sqlite3[a-z].*\.dll$' \ -e '^/usr/bin/msys-\(gomp.*\|vtv.*\)-.*\.dll$' \ -e '^/usr/lib/\(awk\|coreutils\|gawk\|openssl\|pkcs11\)/' \ @@ -357,7 +358,7 @@ else -e '^/usr/ssl/misc/' \ -e '^/usr/bin/\(captoinfo\|clear\|infocmp\|infotocap\)\.exe$' \ -e '^/usr/bin/\(reset\|tabs\|tic\|toe\|tput\|tset\)\.exe$' \ - -e '^/usr/bin/msys-ticw6\.dll$' \ + -e '^/usr/bin/msys-\(ticw6\|smartcols-[0-9]*\)\.dll$' \ -e '^/usr/\(lib\|share\)/terminfo/' -e '^/usr/share/tabset/' \ -e "^\\($(echo $EXTRA_FILE_EXCLUDES | sed 's/ /\\|/g')\\)\$"