Skip to content

Prepare for building UCRT64 packages #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dscho merged 4 commits into from
Jun 9, 2026
+17 −2
Merged

Prepare for building UCRT64 packages #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cabc7e0
please.sh: tolerate a missing `.sparse/makepkg-git-i686` in create-sd…
dscho Jun 7, 2026
6daa14f
make-file-list.sh: accept ARCH=ucrt64
dscho Jun 8, 2026
ea4ac80
please.sh: accept --architecture=ucrt64 in create_sdk_artifact
dscho Jun 8, 2026
54204b8
check-for-missing-dlls.sh: accept MSYSTEM=UCRT64
dscho Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions check-for-missing-dlls.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ die "Could not determine architecture"

case "$MSYSTEM" in
MINGW64) MINGW_PREFIX=mingw64;;
UCRT64)
MINGW_PREFIX=ucrt64
ARCH=ucrt64
;;
CLANGARM64)
MINGW_PREFIX=clangarm64
ARCH=aarch64
Expand Down
4 changes: 4 additions & 0 deletions make-file-list.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ test -n "$ARCH" ||
die "Need ARCH to be set"

case "$ARCH" in
ucrt64)
MSYSTEM_LOWER=ucrt64
PACMAN_ARCH=ucrt-x86_64
;;
x86_64)
MSYSTEM_LOWER=mingw64
PACMAN_ARCH=x86_64
Expand Down
11 changes: 9 additions & 2 deletions please.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ bundle_pdbs () { # [--directory=<artifacts-directory] [--unpack=<directory>] [--
done
}

create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--architecture=(x86_64|i686|aarch64|auto)] [--bitness=(32|64)] [--force] <name>
create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--architecture=(x86_64|i686|aarch64|ucrt64|auto)] [--bitness=(32|64)] [--force] <name>
git_sdk_path=/
output_path=
force=
Expand Down Expand Up @@ -490,6 +490,11 @@ create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--archit
fi

case "$architecture" in
ucrt64)
MSYSTEM=UCRT64
PREFIX="/ucrt64"
SDK_REPO="git-sdk-64"
;;
x86_64)
MSYSTEM=MINGW64
PREFIX="/mingw64"
Expand Down Expand Up @@ -670,7 +675,9 @@ create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--archit
git -C "$git_sdk_path" show HEAD:.sparse/minimal-sdk >"$sparse_checkout_file" &&
printf '\n' >>"$sparse_checkout_file" &&
git -C "$git_sdk_path" show HEAD:.sparse/makepkg-git >>"$sparse_checkout_file" &&
if test x86_64 = $architecture
if test x86_64 = $architecture &&
git -C "$git_sdk_path" rev-parse -q --verify \
HEAD:.sparse/makepkg-git-i686 >/dev/null
then
printf '\n' >>"$sparse_checkout_file" &&
git -C "$git_sdk_path" show HEAD:.sparse/makepkg-git-i686 >>"$sparse_checkout_file"
Expand Down
Loading