From 2cd83da0867ae700c85d5f8e200435204be0d578 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 21 Dec 2022 10:29:07 +0100 Subject: [PATCH 1/8] minimal-sdk: now also need libpsl ... because it's a new dependency of libcurl. Ported-from-git-sdk-64: f76ce435567 (minimal: now also need libpsl, 2022-12-21) Signed-off-by: Johannes Schindelin --- .sparse/minimal-sdk | 1 + 1 file changed, 1 insertion(+) diff --git a/.sparse/minimal-sdk b/.sparse/minimal-sdk index 23bbb89f7bd..adc96973f4e 100644 --- a/.sparse/minimal-sdk +++ b/.sparse/minimal-sdk @@ -50,6 +50,7 @@ /clangarm64/bin/libssl-*.dll /clangarm64/bin/libnghttp2*.dll /clangarm64/bin/libidn2-*.dll +/clangarm64/bin/libpsl*.dll /clangarm64/bin/libssh*.dll /clangarm64/bin/libunistring-*.dll /clangarm64/ssl/certs/ca-bundle.crt From 95bf689da4064fa03c4b77cdd1352982f24782c2 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 21 Jan 2023 17:21:56 +0100 Subject: [PATCH 2/8] minimal-sdk: (re-)include the `ca-bundle.crt` file It was moved recently: https://github.com/msys2/MINGW-packages/pull/15143 This is yet another fall-out. Ported-from-git-sdk-64: c1be5c8ba87 (minimal: (re-)include the `ca-bundle.crt` file, 2023-01-21) Signed-off-by: Johannes Schindelin --- .sparse/minimal-sdk | 1 + 1 file changed, 1 insertion(+) diff --git a/.sparse/minimal-sdk b/.sparse/minimal-sdk index adc96973f4e..a79b8b2e099 100644 --- a/.sparse/minimal-sdk +++ b/.sparse/minimal-sdk @@ -53,6 +53,7 @@ /clangarm64/bin/libpsl*.dll /clangarm64/bin/libssh*.dll /clangarm64/bin/libunistring-*.dll +/clangarm64/etc/ssl/certs/ca-bundle.crt /clangarm64/ssl/certs/ca-bundle.crt /clangarm64/include/curl/ From a14ce0c59e9fba5fd2e7b0140d4bdf7d4e2453e7 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 8 Mar 2023 15:20:06 +0100 Subject: [PATCH 3/8] minimal-sdk: include `stat.exe`, to support the Coverity Pipeline At https://dev.azure.com/Git-for-Windows/git/_build?definitionId=35, Git for Windows maintains automation that submits builds to Coverity for security scanning. We just switched that Pipeline to use a minimal SDK (because it really does not need to spend 4 minutes, 500GB worth of downloaded Git objects and 2GB worth of disk space, just to compile Git and pre-analyze it for Coverity). Among other problems, this uncovered the fact that the pretty basic `stat.exe` utility was not included in the minimal SDK. Now, Git's test suite seems to be fine, probably because 1) it runs via Bash, which has `stat` as a built-in, or 2) errors might be ignored or misinterpreted. But let's just include `stat` in minimal SDK. Ported-from-git-sdk-64: ed0213bd05e (minimal-sdk: include `stat.exe`, to support the Coverity Pipeline, 2023-03-08) Signed-off-by: Johannes Schindelin --- .sparse/minimal-sdk | 1 + 1 file changed, 1 insertion(+) diff --git a/.sparse/minimal-sdk b/.sparse/minimal-sdk index a79b8b2e099..50caf2718e9 100644 --- a/.sparse/minimal-sdk +++ b/.sparse/minimal-sdk @@ -218,6 +218,7 @@ /usr/bin/head.exe /usr/bin/rmdir.exe /usr/bin/setfacl.exe +/usr/bin/stat.exe /usr/bin/sleep.exe /usr/bin/tail.exe /usr/bin/tar.exe From 2f3fabbbf9a33bd98f723ae194c793fb2174cc0b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 8 Mar 2023 15:31:33 +0100 Subject: [PATCH 4/8] minimal-sdk: fix `unzip` The `unzip.exe` tool we are including in the minimal subset of Git for Windows' SDK nowadays links to `msys-bz2-1.dll`, but that library was not included. Let's include it, and add a test that verifies that this tool works. Ported-from-git-sdk-64: 994f67f030e (minimal-zip: fix `unzip`, 2023-03-08) Signed-off-by: Johannes Schindelin --- .sparse/minimal-sdk | 1 + 1 file changed, 1 insertion(+) diff --git a/.sparse/minimal-sdk b/.sparse/minimal-sdk index 50caf2718e9..4f6370763e3 100644 --- a/.sparse/minimal-sdk +++ b/.sparse/minimal-sdk @@ -227,5 +227,6 @@ /usr/bin/tput.exe /usr/bin/true.exe /usr/bin/unzip.exe +/usr/bin/msys-bz2-[0-9]*.dll /usr/bin/xargs.exe /usr/bin/zipinfo.exe From 0d5e7111ca73498e8b69f54a783be61827eb70fc Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 13 Aug 2024 11:00:44 +0000 Subject: [PATCH 5/8] minimal-sdk: make Clang's gcc-compat functional The `gcc.exe` provided by Clang needs another DLL that was not required when `gcc.exe` really was GCC. Signed-off-by: Johannes Schindelin --- .sparse/minimal-sdk | 1 + 1 file changed, 1 insertion(+) diff --git a/.sparse/minimal-sdk b/.sparse/minimal-sdk index 4f6370763e3..580b0fe3d50 100644 --- a/.sparse/minimal-sdk +++ b/.sparse/minimal-sdk @@ -33,6 +33,7 @@ # The gcc-compat package provides a link from # gcc.exe to clang /clangarm64/bin/gcc.exe +/clangarm64/bin/libc++.dll # gettext (msgfmt) /clangarm64/bin/msgfmt.exe From 84b845eafc20c031a628038460027609ccd402f9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 22 Jul 2024 12:42:52 +0200 Subject: [PATCH 6/8] makepkg-git: do include gettext and error_highlight In https://github.com/msys2/MSYS2-packages/commit/d7c37ffdadd, `gettext` was identified as an incorrect dependency of the `xz` package and that dependency was dropped. As a consequence, Git for Windows no longer included `gettext`, which uncovered a bug in the definition of the `makepkg-git` SDK artifact where it relied on that implicit dependency instead of making it an explicit requirement (because it is needed by `makepkg` and `makepkg-mingw`). Let's make it explicit that `gettext.exe` (and `xgettext.exe`) are to be included in the `makepkg-git` SDK artifact. While at it, also avoid the "`error_highlight' was not loaded." warning when building Git for Windows' `mingw-w64-git-doc-html` package. This addresses the previously-forgotten x86_64 part of https://github.com/git-for-windows/git/issues/4952; The i686 part of was fixed by https://github.com/git-for-windows/build-extra/pull/560 already. Ported-from-git-sdk-64: a6f190ccbfb (makepkg-git: do include gettext and error_highlight, 2024-07-22) Signed-off-by: Johannes Schindelin --- .sparse/makepkg-git | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.sparse/makepkg-git b/.sparse/makepkg-git index 512d41ff5d0..6f2b4020392 100644 --- a/.sparse/makepkg-git +++ b/.sparse/makepkg-git @@ -52,6 +52,14 @@ /usr/share/makepkg/ /usr/bin/zstd.exe +# gettext (for makepkg) +/usr/bin/gettext.exe +/usr/bin/xgettext.exe +/usr/bin/msys-gettext*.dll + +# The `error_highlight` Ruby gem, needed by `asciidoctor` +*error_highlight* + # AsciiDoc /clangarm64/bin/asciidoc.exe /clangarm64/bin/asciidoc-script.py From 59d5d84a2c87869cd79293637ea0de81ec5f1977 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 13 Aug 2024 13:16:03 +0200 Subject: [PATCH 7/8] makepkg-git: update superseded OpenSSL version It is a bit strange that this seems to work in git-sdk-64, because in git-sdk-arm64 `bsdtar.exe` fails to load, complaining about a missing `msys-crypto-3.dll`. It is the right thing to loosen the pattern anyway, though, so let's do that. Signed-off-by: Johannes Schindelin --- .sparse/makepkg-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sparse/makepkg-git b/.sparse/makepkg-git index 6f2b4020392..2d38ad74931 100644 --- a/.sparse/makepkg-git +++ b/.sparse/makepkg-git @@ -33,7 +33,7 @@ /usr/bin/msys-magic*.dll /usr/share/misc/magic.mgc /usr/bin/bsdtar.exe -/usr/bin/msys-crypto-1.1.dll +/usr/bin/msys-crypto-*.dll /usr/bin/msys-zstd*.dll /usr/bin/msys-nettle*.dll /usr/bin/msys-lzma*.dll From 5345bf6e795208b136b0c67890987ba2d477ec2d Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 12 Aug 2024 21:04:00 +0200 Subject: [PATCH 8/8] makepkg-git: use AsciiDoctor again In https://github.com/git-for-windows/git-sdk-arm64/pull/6, we switched the `makepkg-git` SDK artifact in git-sdk-arm64 away from using AsciiDoctor to using AsciiDoc instead. The reason was that the former was not yet supported in the `clangarm64` packages in MSYS2. In the meantime, AsciiDoctor is not only supported, but now also required to build `mingw-w64-clang-aarch64-git`. So let's adjust the `makepkg-git` sparse checkout definition accordingly. Signed-off-by: Johannes Schindelin --- .sparse/makepkg-git | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/.sparse/makepkg-git b/.sparse/makepkg-git index 2d38ad74931..ab9a8275ec5 100644 --- a/.sparse/makepkg-git +++ b/.sparse/makepkg-git @@ -60,16 +60,33 @@ # The `error_highlight` Ruby gem, needed by `asciidoctor` *error_highlight* -# AsciiDoc -/clangarm64/bin/asciidoc.exe -/clangarm64/bin/asciidoc-script.py -/clangarm64/bin/python* -/clangarm64/bin/libpython*.dll -/clangarm64/lib/python*/ -!/clangarm64/lib/python*/site-packages/ -!/clangarm64/lib/python*/test/ -/clangarm64/lib/python*/site-packages/asciidoc/ -/clangarm64/lib/python*/site-packages/asciidoc*-info/ +# AsciiDoctor +/clangarm64/bin/asciidoctor +/clangarm64/bin/ruby.exe +/clangarm64/bin/ruby*.dll +/clangarm64/lib/ruby/*/aarch64-mingw-ucrt/rbconfig.rb +/clangarm64/lib/ruby/*/rubygems.rb +/clangarm64/lib/ruby/*/rubygems/ +/clangarm64/lib/ruby/*/delegate.rb +/clangarm64/lib/ruby/*/uri.rb +/clangarm64/lib/ruby/*/uri/ +/clangarm64/lib/ruby/*/aarch64-mingw-ucrt/stringio.so +/clangarm64/lib/ruby/*/monitor.rb +/clangarm64/lib/ruby/*/aarch64-mingw-ucrt/monitor.so +/clangarm64/lib/ruby/gems/*/gems/asciidoctor-* +/clangarm64/lib/ruby/gems/*/specifications/asciidoctor-*.gemspec +/clangarm64/lib/ruby/*/tsort.rb +/clangarm64/lib/ruby/*/set.rb +/clangarm64/lib/ruby/*/logger.rb +/clangarm64/lib/ruby/*/aarch64-mingw-ucrt/enc/encdb.so +/clangarm64/lib/ruby/*/aarch64-mingw-ucrt/enc/windows_1252.so +/clangarm64/lib/ruby/*/optparse.rb +/clangarm64/lib/ruby/*/aarch64-mingw-ucrt/strscan.so +/clangarm64/lib/ruby/*/pathname.rb +/clangarm64/lib/ruby/*/aarch64-mingw-ucrt/pathname.so +/clangarm64/lib/ruby/*/did_you_mean* +/clangarm64/lib/ruby/*/cgi/util* +/clangarm64/lib/ruby/*/logger* # xsltproc (e.g. for Git's user-manual.html) /usr/bin/xsltproc.exe