Skip to content

Commit 8ffa8b8

Browse files
committed
.sparse/makepkg-git: target /ucrt64/ instead of /mingw64/
The bulk of this file is a straight `/mingw64/` -> `/ucrt64/` substitution, just like the minimal-sdk definition that just got adjusted. Two MSYS2 naming differences need separate handling for the asciidoctor/Ruby block, however: the Ruby DLL in the UCRT64 environment is `x64-ucrt-ruby<ver>.dll` rather than the MSVCRT-flavored `x64-msvcrt-ruby<ver>.dll`, and the per-arch subdirectory that Ruby uses for native extensions is `x64-mingw-ucrt/` rather than `x64-mingw32/`. Both of those have to be renamed in tandem with the top-level path, otherwise the sparse checkout would silently skip the Ruby pieces that asciidoctor depends on. `cv2pdb` is still referenced under `/ucrt64/bin/`, even though it currently lacks a UCRT64 counterpart (it's on the skipped-packages list posted by the conversion workflow). That's fine for a sparse-checkout file: it only selects what to materialize once such a package is built and added to the SDK. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent eae6b84 commit 8ffa8b8

1 file changed

Lines changed: 47 additions & 47 deletions

File tree

.sparse/makepkg-git

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -61,35 +61,35 @@
6161
*error_highlight*
6262

6363
# AsciiDoctor
64-
/mingw64/bin/asciidoctor
65-
/mingw64/bin/ruby.exe
66-
/mingw64/bin/x64-msvcrt-ruby*.dll
67-
/mingw64/lib/ruby/*/x64-mingw32/rbconfig.rb
68-
/mingw64/lib/ruby/*/rubygems.rb
69-
/mingw64/lib/ruby/*/rubygems/
70-
/mingw64/lib/ruby/*/delegate.rb
71-
/mingw64/lib/ruby/*/uri.rb
72-
/mingw64/lib/ruby/*/uri/
73-
/mingw64/lib/ruby/*/x64-mingw32/stringio.so
74-
/mingw64/lib/ruby/*/monitor.rb
75-
/mingw64/lib/ruby/*/x64-mingw32/monitor.so
76-
/mingw64/lib/ruby/gems/*/gems/asciidoctor-*
77-
/mingw64/lib/ruby/gems/*/specifications/asciidoctor-*.gemspec
78-
/mingw64/lib/ruby/*/tsort.rb
79-
/mingw64/lib/ruby/*/set.rb
80-
/mingw64/lib/ruby/*/logger.rb
81-
/mingw64/lib/ruby/*/x64-mingw32/enc/encdb.so
82-
/mingw64/lib/ruby/*/x64-mingw32/enc/windows_1252.so
83-
/mingw64/lib/ruby/*/optparse.rb
84-
/mingw64/lib/ruby/*/strscan/strscan.rb
85-
/mingw64/lib/ruby/*/x64-mingw32/strscan.so
86-
/mingw64/lib/ruby/*/pathname.rb
87-
/mingw64/lib/ruby/*/x64-mingw32/pathname.so
88-
/mingw64/lib/ruby/*/did_you_mean*
89-
/mingw64/lib/ruby/*/cgi/util*
90-
/mingw64/lib/ruby/*/logger*
91-
/mingw64/lib/ruby/*/bundled_gems.rb
92-
/mingw64/lib/ruby/*/syntax_suggest*
64+
/ucrt64/bin/asciidoctor
65+
/ucrt64/bin/ruby.exe
66+
/ucrt64/bin/x64-ucrt-ruby*.dll
67+
/ucrt64/lib/ruby/*/x64-mingw-ucrt/rbconfig.rb
68+
/ucrt64/lib/ruby/*/rubygems.rb
69+
/ucrt64/lib/ruby/*/rubygems/
70+
/ucrt64/lib/ruby/*/delegate.rb
71+
/ucrt64/lib/ruby/*/uri.rb
72+
/ucrt64/lib/ruby/*/uri/
73+
/ucrt64/lib/ruby/*/x64-mingw-ucrt/stringio.so
74+
/ucrt64/lib/ruby/*/monitor.rb
75+
/ucrt64/lib/ruby/*/x64-mingw-ucrt/monitor.so
76+
/ucrt64/lib/ruby/gems/*/gems/asciidoctor-*
77+
/ucrt64/lib/ruby/gems/*/specifications/asciidoctor-*.gemspec
78+
/ucrt64/lib/ruby/*/tsort.rb
79+
/ucrt64/lib/ruby/*/set.rb
80+
/ucrt64/lib/ruby/*/logger.rb
81+
/ucrt64/lib/ruby/*/x64-mingw-ucrt/enc/encdb.so
82+
/ucrt64/lib/ruby/*/x64-mingw-ucrt/enc/windows_1252.so
83+
/ucrt64/lib/ruby/*/optparse.rb
84+
/ucrt64/lib/ruby/*/strscan/strscan.rb
85+
/ucrt64/lib/ruby/*/x64-mingw-ucrt/strscan.so
86+
/ucrt64/lib/ruby/*/pathname.rb
87+
/ucrt64/lib/ruby/*/x64-mingw-ucrt/pathname.so
88+
/ucrt64/lib/ruby/*/did_you_mean*
89+
/ucrt64/lib/ruby/*/cgi/util*
90+
/ucrt64/lib/ruby/*/logger*
91+
/ucrt64/lib/ruby/*/bundled_gems.rb
92+
/ucrt64/lib/ruby/*/syntax_suggest*
9393

9494
# xsltproc (e.g. for Git's user-manual.html)
9595
/usr/bin/xsltproc.exe
@@ -116,21 +116,21 @@
116116
/usr/share/perl5/core_perl/parent.pm
117117

118118
# For building `git-wrapper.exe` in `mingw-w64-git`
119-
/mingw64/include/sh*
120-
/mingw64/lib/libshlwapi.a
121-
/mingw64/x86_64-w64-mingw32/lib/libshlwapi.a
122-
/mingw64/x86_64-w64-mingw32/lib/libcomdlg32.a
119+
/ucrt64/include/sh*
120+
/ucrt64/lib/libshlwapi.a
121+
/ucrt64/x86_64-w64-mingw32/lib/libshlwapi.a
122+
/ucrt64/x86_64-w64-mingw32/lib/libcomdlg32.a
123123

124124
# For `cv2pdb-strip` in `mingw-w64-git`
125125
/usr/bin/stat.exe
126-
/mingw64/bin/cv2pdb.exe
126+
/ucrt64/bin/cv2pdb.exe
127127

128128
# For "installing" into `pkg/`
129129
/usr/bin/install.exe
130130

131131
# For a functional `tclsh` so that git-gui can be built
132-
/mingw64/bin/wish.exe
133-
/mingw64/lib/tcl8.6/
132+
/ucrt64/bin/wish.exe
133+
/ucrt64/lib/tcl8.6/
134134

135135
# To compress Pacman packages
136136
/usr/bin/xz.exe
@@ -139,14 +139,14 @@
139139
/etc/xml/docbook-xml
140140

141141
# For code-signing
142-
/mingw64/bin/osslsigncode.exe
143-
/mingw64/bin/libgsf-[0-9]*.dll
144-
/mingw64/bin/libglib-[0-9]*.dll
145-
/mingw64/bin/libgobject-[0-9]*.dll
146-
/mingw64/bin/libgio-[0-9]*.dll
147-
/mingw64/bin/libxml2-[0-9]*.dll
148-
/mingw64/bin/libgmodule-[0-9]*.dll
149-
/mingw64/bin/libbz2-[0-9]*.dll
150-
/mingw64/bin/liblzma-[0-9]*.dll
151-
/mingw64/bin/libpcre-[0-9]*.dll
152-
/mingw64/bin/libffi-[0-9]*.dll
142+
/ucrt64/bin/osslsigncode.exe
143+
/ucrt64/bin/libgsf-[0-9]*.dll
144+
/ucrt64/bin/libglib-[0-9]*.dll
145+
/ucrt64/bin/libgobject-[0-9]*.dll
146+
/ucrt64/bin/libgio-[0-9]*.dll
147+
/ucrt64/bin/libxml2-[0-9]*.dll
148+
/ucrt64/bin/libgmodule-[0-9]*.dll
149+
/ucrt64/bin/libbz2-[0-9]*.dll
150+
/ucrt64/bin/liblzma-[0-9]*.dll
151+
/ucrt64/bin/libpcre-[0-9]*.dll
152+
/ucrt64/bin/libffi-[0-9]*.dll

0 commit comments

Comments
 (0)