Skip to content

Commit 43e407b

Browse files
author
Git for Windows Build Agent
committed
Update 19 packages
apr (1.7.5-1 -> 1.7.6-1) bsdcpio (3.7.9-1 -> 3.8.0-1) bsdtar (3.7.9-1 -> 3.8.0-1) filesystem (2025.02.23-1 -> 2025.05.08-1) less (668-1 -> 678-1) libarchive (3.7.9-1 -> 3.8.0-1) mingw-w64-i686-crt-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-i686-headers-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-i686-libmangle-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-i686-libwinpthread-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-i686-tools-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-i686-winpthreads-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-x86_64-crt-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-x86_64-headers-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-x86_64-libmangle-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-x86_64-libwinpthread-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-x86_64-tools-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) mingw-w64-x86_64-winpthreads-git (12.0.0.r731.g2ca6f1348-1 -> 12.0.0.r735.g4a3edb6f8-1) pacman (6.1.0-11 -> 6.1.0-14) Signed-off-by: Git for Windows Build Agent <ci@git-for-windows.build>
1 parent 68d698b commit 43e407b

313 files changed

Lines changed: 258 additions & 214 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

etc/makepkg_mingw.conf

Lines changed: 2 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -33,71 +33,8 @@ VCSCLIENTS=('bzr::breezy'
3333
#########################################################################
3434
#
3535

36-
if [[ "$MSYSTEM" == "MINGW64" ]]; then
37-
CARCH="x86_64"
38-
CHOST="x86_64-w64-mingw32"
39-
MINGW_CHOST="x86_64-w64-mingw32"
40-
MINGW_PREFIX="/mingw64"
41-
MINGW_PACKAGE_PREFIX="mingw-w64-x86_64"
42-
CC="gcc"
43-
CXX="g++"
44-
CPPFLAGS=
45-
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
46-
CXXFLAGS="$CFLAGS"
47-
LDFLAGS=""
48-
RUSTFLAGS="-Cforce-frame-pointers=yes"
49-
elif [[ "$MSYSTEM" == "MINGW32" ]]; then
50-
CARCH="i686"
51-
CHOST="i686-w64-mingw32"
52-
MINGW_CHOST="i686-w64-mingw32"
53-
MINGW_PREFIX="/mingw32"
54-
MINGW_PACKAGE_PREFIX="mingw-w64-i686"
55-
CC="gcc"
56-
CXX="g++"
57-
CPPFLAGS=
58-
CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
59-
CXXFLAGS="$CFLAGS"
60-
LDFLAGS="-Wl,--no-seh -Wl,--large-address-aware"
61-
RUSTFLAGS="-Cforce-frame-pointers=yes"
62-
elif [[ "$MSYSTEM" == "CLANG64" ]]; then
63-
CARCH="x86_64"
64-
CHOST="x86_64-w64-mingw32"
65-
MINGW_CHOST="x86_64-w64-mingw32"
66-
MINGW_PREFIX="/clang64"
67-
MINGW_PACKAGE_PREFIX="mingw-w64-clang-x86_64"
68-
CC="clang"
69-
CXX="clang++"
70-
CPPFLAGS=
71-
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
72-
CXXFLAGS="$CFLAGS"
73-
LDFLAGS=""
74-
RUSTFLAGS="-Cforce-frame-pointers=yes"
75-
elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
76-
CARCH="aarch64"
77-
CHOST="aarch64-w64-mingw32"
78-
MINGW_CHOST="aarch64-w64-mingw32"
79-
MINGW_PREFIX="/clangarm64"
80-
MINGW_PACKAGE_PREFIX="mingw-w64-clang-aarch64"
81-
CC="clang"
82-
CXX="clang++"
83-
CPPFLAGS=
84-
CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
85-
CXXFLAGS="$CFLAGS"
86-
LDFLAGS=""
87-
RUSTFLAGS="-Cforce-frame-pointers=yes"
88-
elif [[ "$MSYSTEM" == "UCRT64" ]]; then
89-
CARCH="x86_64"
90-
CHOST="x86_64-w64-mingw32"
91-
MINGW_CHOST="x86_64-w64-mingw32"
92-
MINGW_PREFIX="/ucrt64"
93-
MINGW_PACKAGE_PREFIX="mingw-w64-ucrt-x86_64"
94-
CC="gcc"
95-
CXX="g++"
96-
CPPFLAGS=
97-
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
98-
CXXFLAGS="$CFLAGS"
99-
LDFLAGS=""
100-
RUSTFLAGS="-Cforce-frame-pointers=yes"
36+
if [ -e "/etc/makepkg_mingw.d/${MSYSTEM,,}.conf" ]; then
37+
source "/etc/makepkg_mingw.d/${MSYSTEM,,}.conf"
10138
else
10239
echo "Unsupported MSYSTEM: $MSYSTEM"
10340
exit 1

etc/makepkg_mingw.d/clang64.conf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CARCH="x86_64"
2+
CHOST="x86_64-w64-mingw32"
3+
MINGW_CHOST="x86_64-w64-mingw32"
4+
MINGW_PREFIX="/clang64"
5+
MINGW_PACKAGE_PREFIX="mingw-w64-clang-x86_64"
6+
CC="clang"
7+
CXX="clang++"
8+
CPPFLAGS=
9+
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
10+
CXXFLAGS="$CFLAGS"
11+
LDFLAGS=""
12+
RUSTFLAGS="-Cforce-frame-pointers=yes -Ctarget-feature=+crt-static"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CARCH="aarch64"
2+
CHOST="aarch64-w64-mingw32"
3+
MINGW_CHOST="aarch64-w64-mingw32"
4+
MINGW_PREFIX="/clangarm64"
5+
MINGW_PACKAGE_PREFIX="mingw-w64-clang-aarch64"
6+
CC="clang"
7+
CXX="clang++"
8+
CPPFLAGS=
9+
CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
10+
CXXFLAGS="$CFLAGS"
11+
LDFLAGS=""
12+
RUSTFLAGS="-Cforce-frame-pointers=yes -Ctarget-feature=+crt-static"

etc/makepkg_mingw.d/mingw32.conf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CARCH="i686"
2+
CHOST="i686-w64-mingw32"
3+
MINGW_CHOST="i686-w64-mingw32"
4+
MINGW_PREFIX="/mingw32"
5+
MINGW_PACKAGE_PREFIX="mingw-w64-i686"
6+
CC="gcc"
7+
CXX="g++"
8+
CPPFLAGS=
9+
CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
10+
CXXFLAGS="$CFLAGS"
11+
LDFLAGS="-Wl,--no-seh -Wl,--large-address-aware"
12+
RUSTFLAGS="-Cforce-frame-pointers=yes"

etc/makepkg_mingw.d/mingw64.conf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CARCH="x86_64"
2+
CHOST="x86_64-w64-mingw32"
3+
MINGW_CHOST="x86_64-w64-mingw32"
4+
MINGW_PREFIX="/mingw64"
5+
MINGW_PACKAGE_PREFIX="mingw-w64-x86_64"
6+
CC="gcc"
7+
CXX="g++"
8+
CPPFLAGS=
9+
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
10+
CXXFLAGS="$CFLAGS"
11+
LDFLAGS=""
12+
RUSTFLAGS="-Cforce-frame-pointers=yes"

etc/makepkg_mingw.d/ucrt64.conf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CARCH="x86_64"
2+
CHOST="x86_64-w64-mingw32"
3+
MINGW_CHOST="x86_64-w64-mingw32"
4+
MINGW_PREFIX="/ucrt64"
5+
MINGW_PACKAGE_PREFIX="mingw-w64-ucrt-x86_64"
6+
CC="gcc"
7+
CXX="g++"
8+
CPPFLAGS=
9+
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1"
10+
CXXFLAGS="$CFLAGS"
11+
LDFLAGS=""
12+
RUSTFLAGS="-Cforce-frame-pointers=yes"

etc/msystem

Lines changed: 5 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -20,56 +20,8 @@ unset MINGW_CHOST
2020
unset MINGW_PREFIX
2121
unset MINGW_PACKAGE_PREFIX
2222

23-
case "${MSYSTEM}" in
24-
MINGW32)
25-
MSYSTEM_PREFIX='/mingw32'
26-
MSYSTEM_CARCH='i686'
27-
MSYSTEM_CHOST='i686-w64-mingw32'
28-
MINGW_CHOST="${MSYSTEM_CHOST}"
29-
MINGW_PREFIX="${MSYSTEM_PREFIX}"
30-
MINGW_PACKAGE_PREFIX="mingw-w64-${MSYSTEM_CARCH}"
31-
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
32-
;;
33-
MINGW64)
34-
MSYSTEM_PREFIX='/mingw64'
35-
MSYSTEM_CARCH='x86_64'
36-
MSYSTEM_CHOST='x86_64-w64-mingw32'
37-
MINGW_CHOST="${MSYSTEM_CHOST}"
38-
MINGW_PREFIX="${MSYSTEM_PREFIX}"
39-
MINGW_PACKAGE_PREFIX="mingw-w64-${MSYSTEM_CARCH}"
40-
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
41-
;;
42-
CLANG64)
43-
MSYSTEM_PREFIX='/clang64'
44-
MSYSTEM_CARCH='x86_64'
45-
MSYSTEM_CHOST='x86_64-w64-mingw32'
46-
MINGW_CHOST="${MSYSTEM_CHOST}"
47-
MINGW_PREFIX="${MSYSTEM_PREFIX}"
48-
MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
49-
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
50-
;;
51-
CLANGARM64)
52-
MSYSTEM_PREFIX='/clangarm64'
53-
MSYSTEM_CARCH='aarch64'
54-
MSYSTEM_CHOST='aarch64-w64-mingw32'
55-
MINGW_CHOST="${MSYSTEM_CHOST}"
56-
MINGW_PREFIX="${MSYSTEM_PREFIX}"
57-
MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
58-
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
59-
;;
60-
UCRT64)
61-
MSYSTEM_PREFIX='/ucrt64'
62-
MSYSTEM_CARCH='x86_64'
63-
MSYSTEM_CHOST='x86_64-w64-mingw32'
64-
MINGW_CHOST="${MSYSTEM_CHOST}"
65-
MINGW_PREFIX="${MSYSTEM_PREFIX}"
66-
MINGW_PACKAGE_PREFIX="mingw-w64-ucrt-${MSYSTEM_CARCH}"
67-
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
68-
;;
69-
*)
70-
MSYSTEM_PREFIX='/usr'
71-
MSYSTEM_CARCH="$(/usr/bin/uname -m)"
72-
MSYSTEM_CHOST="${MSYSTEM_CARCH}-pc-msys"
73-
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST
74-
;;
75-
esac
23+
if [ -e "/etc/msystem.d/${MSYSTEM}" ]; then
24+
source "/etc/msystem.d/${MSYSTEM}"
25+
else
26+
source "/etc/msystem.d/MSYS"
27+
fi

etc/msystem.d/CLANG64

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
MSYSTEM_PREFIX='/clang64'
2+
MSYSTEM_CARCH='x86_64'
3+
MSYSTEM_CHOST='x86_64-w64-mingw32'
4+
MINGW_CHOST="${MSYSTEM_CHOST}"
5+
MINGW_PREFIX="${MSYSTEM_PREFIX}"
6+
MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
7+
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX

etc/msystem.d/CLANGARM64

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
MSYSTEM_PREFIX='/clangarm64'
2+
MSYSTEM_CARCH='aarch64'
3+
MSYSTEM_CHOST='aarch64-w64-mingw32'
4+
MINGW_CHOST="${MSYSTEM_CHOST}"
5+
MINGW_PREFIX="${MSYSTEM_PREFIX}"
6+
MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
7+
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX

etc/msystem.d/MINGW32

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
MSYSTEM_PREFIX='/mingw32'
2+
MSYSTEM_CARCH='i686'
3+
MSYSTEM_CHOST='i686-w64-mingw32'
4+
MINGW_CHOST="${MSYSTEM_CHOST}"
5+
MINGW_PREFIX="${MSYSTEM_PREFIX}"
6+
MINGW_PACKAGE_PREFIX="mingw-w64-${MSYSTEM_CARCH}"
7+
export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX

0 commit comments

Comments
 (0)