Skip to content

Commit ae2895e

Browse files
kleisaukekleisauke
committed
Update toolchains
- Update LLVM to 15.0.0. - Update MinGW-w64 to the latest master version. MXE Updates: - Update GCC to 12.2.0.
1 parent 561ba7c commit ae2895e

File tree

13 files changed

+160
-47
lines changed

13 files changed

+160
-47
lines changed

‎build/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
# Always checkout a particular revision which will successfully build.
5252
# This ensures that it will not suddenly break a build.
5353
# Note: Must be regularly updated.
54-
revision="46cf2d3f6e55d3ea30f515041bf01352c4f1a7ce"
54+
revision="fa26c6fd61596109d289c80f73a2d1b08736ac3f"
5555
initialize=false
5656

5757
if [ -f "$mxe_dir/Makefile" ]; then

‎build/overrides.mk‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,16 @@ nasm_FILE := nasm-$(nasm_VERSION).tar.xz
178178
nasm_URL := https://www.nasm.us/pub/nasm/releasebuilds/$(nasm_VERSION)/$(nasm_FILE)
179179
nasm_URL_2 := https://sources.voidlinux.org/nasm-$(nasm_VERSION)/$(nasm_FILE)
180180

181+
# upstream version is 10.0.0
182+
# Update MinGW-w64 to d4a0c84
183+
# https://github.com/mingw-w64/mingw-w64/tarball/d4a0c84d908243a45255a06dc293d3d7c06db98c
184+
mingw-w64_VERSION := d4a0c84
185+
mingw-w64_CHECKSUM := 1bf133d9827756223f4610601a87e129b11f2caa91ebf993a6017c4a4bab06dc
186+
mingw-w64_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/mingw-w64-[0-9]*.patch)))
187+
mingw-w64_SUBDIR := mingw-w64-mingw-w64-$(mingw-w64_VERSION)
188+
mingw-w64_FILE := mingw-w64-mingw-w64-$(mingw-w64_VERSION).tar.gz
189+
mingw-w64_URL := https://github.com/mingw-w64/mingw-w64/tarball/$(mingw-w64_VERSION)/$(mingw-w64_FILE)
190+
181191
## Patches that we override with our own
182192

183193
freetype_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/freetype-[0-9]*.patch)))

‎build/patches/fftw-3-fixes.patch‎

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
55
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
66
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
77
Date: Sun, 16 Feb 2020 19:20:00 +0100
8-
Subject: [PATCH 1/1] Fixes for the llvm-mingw ARM/ARM64 build
8+
Subject: [PATCH 1/3] Fixes for the llvm-mingw ARM/ARM64 build
99

1010

1111
diff --git a/threads/threads.c b/threads/threads.c
@@ -28,3 +28,80 @@ index 1111111..2222222 100644
2828
Sleep(0);
2929
}
3030
}
31+
32+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
33+
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
34+
Date: Tue, 2 Aug 2022 22:01:33 +0200
35+
Subject: [PATCH 2/3] Fix build with LLVM 15
36+
37+
38+
diff --git a/configure.ac b/configure.ac
39+
index 1111111..2222222 100644
40+
--- a/configure.ac
41+
+++ b/configure.ac
42+
@@ -698,11 +698,8 @@ THREADLIBS=""
43+
if test "$enable_threads" = "yes"; then
44+
# Win32 threads are the default on Windows:
45+
if test -z "$THREADLIBS"; then
46+
- AC_MSG_CHECKING([for Win32 threads])
47+
- AC_TRY_LINK([#include <windows.h>],
48+
- [_beginthreadex(0,0,0,0,0,0);],
49+
- [THREADLIBS=" "; AC_MSG_RESULT(yes)],
50+
- [AC_MSG_RESULT(no)])
51+
+ AC_CHECK_FUNC([_beginthreadex],
52+
+ [THREADLIBS=" ";])
53+
fi
54+
55+
# POSIX threads, the default choice everywhere else:
56+
57+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
58+
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
59+
Date: Tue, 2 Aug 2022 22:02:32 +0200
60+
Subject: [PATCH 3/3] Regenerate configure
61+
62+
63+
diff --git a/configure b/configure
64+
index 1111111..2222222 100755
65+
--- a/configure
66+
+++ b/configure
67+
@@ -21520,36 +21520,11 @@ THREADLIBS=""
68+
if test "$enable_threads" = "yes"; then
69+
# Win32 threads are the default on Windows:
70+
if test -z "$THREADLIBS"; then
71+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Win32 threads" >&5
72+
-$as_echo_n "checking for Win32 threads... " >&6; }
73+
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
74+
-/* end confdefs.h. */
75+
-#include <windows.h>
76+
-#ifdef F77_DUMMY_MAIN
77+
-
78+
-# ifdef __cplusplus
79+
- extern "C"
80+
-# endif
81+
- int F77_DUMMY_MAIN() { return 1; }
82+
-
83+
-#endif
84+
-int
85+
-main ()
86+
-{
87+
-_beginthreadex(0,0,0,0,0,0);
88+
- ;
89+
- return 0;
90+
-}
91+
-_ACEOF
92+
-if ac_fn_c_try_link "$LINENO"; then :
93+
- THREADLIBS=" "; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
94+
-$as_echo "yes" >&6; }
95+
-else
96+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
97+
-$as_echo "no" >&6; }
98+
+ ac_fn_c_check_func "$LINENO" "_beginthreadex" "ac_cv_func__beginthreadex"
99+
+if test "x$ac_cv_func__beginthreadex" = xyes; then :
100+
+ THREADLIBS=" ";
101+
fi
102+
-rm -f core conftest.err conftest.$ac_objext \
103+
- conftest$ac_exeext conftest.$ac_ext
104+
+
105+
fi
106+
107+
# POSIX threads, the default choice everywhere else:

‎build/patches/glib-2-fixes.patch‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
55
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
66
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
77
Date: Fri, 24 Jun 2022 11:15:23 +0200
8-
Subject: [PATCH 1/1] Ensure standalone intl support library can be found
8+
Subject: [PATCH 1/2] Ensure standalone intl support library can be found
99

1010
See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2109#note_1485662
1111

@@ -38,3 +38,29 @@ index 1111111..2222222 100644
3838
else
3939
libintl = subproject('proxy-libintl').get_variable('intl_dep')
4040
libintl_deps = [libintl]
41+
42+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
43+
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
44+
Date: Tue, 2 Aug 2022 18:46:43 +0200
45+
Subject: [PATCH 2/2] Fix build with LLVM 15
46+
47+
glib/gthread-win32.c:359:16: error: incompatible integer to pointer conversion passing 'DWORD' (aka 'unsigned long') to parameter of type 'gpointer' (aka 'void *') [-Wint-conversion]
48+
if (!g_atomic_pointer_compare_and_exchange (&key->p, NULL, impl))
49+
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
50+
glib/gatomic.h:257:73: note: expanded from macro 'g_atomic_pointer_compare_and_exchange'
51+
__atomic_compare_exchange_n ((atomic), (void *) (&(gapcae_oldval)), (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \
52+
^~~~~~~~
53+
54+
diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
55+
index 1111111..2222222 100644
56+
--- a/glib/gthread-win32.c
57+
+++ b/glib/gthread-win32.c
58+
@@ -356,7 +356,7 @@ g_private_get_impl (GPrivate *key)
59+
}
60+
61+
/* Ditto, due to the unlocked access on the fast path */
62+
- if (!g_atomic_pointer_compare_and_exchange (&key->p, NULL, impl))
63+
+ if (!g_atomic_pointer_compare_and_exchange (&key->p, NULL, GUINT_TO_POINTER (impl)))
64+
g_thread_abort (0, "g_private_get_impl(2)");
65+
}
66+
LeaveCriticalSection (&g_private_lock);

‎build/patches/mingw-w64-9-ucrtbased.patch‎ renamed to ‎build/patches/mingw-w64-11-ucrtbased.patch‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ index 1111111..2222222 100644
2727
src_libm=_libm_dummy.c
2828

2929
if ENABLE_DFP
30-
@@ -906,7 +912,7 @@ lib32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
30+
@@ -913,7 +919,7 @@ lib32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
3131
lib32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
3232

3333
processed_defs += lib32/msvcrt.def lib32/msvcr80.def lib32/msvcr90.def lib32/msvcr90d.def lib32/msvcr100.def lib32/msvcr110.def lib32/msvcr120.def lib32/msvcr120d.def \
@@ -36,7 +36,7 @@ index 1111111..2222222 100644
3636
lib32/api-ms-win-crt-math-l1-1-0.def lib32/api-ms-win-crt-private-l1-1-0.def lib32/api-ms-win-crt-runtime-l1-1-0.def \
3737
lib32/vcruntime140_app.def
3838

39-
@@ -977,6 +983,10 @@ lib32_DATA += lib32/libucrtbase.a
39+
@@ -984,6 +990,10 @@ lib32_DATA += lib32/libucrtbase.a
4040
lib32/libucrtbase.a: lib-common/ucrtbase.mri lib32/libucrtbase_def.a lib32/libucrt_extra.a
4141
cd $(dir $@) && $(AR) -M < $(abspath $<)
4242

@@ -47,7 +47,7 @@ index 1111111..2222222 100644
4747
lib32_DATA += lib32/libucrt.a lib32/libucrtapp.a
4848
noinst_LIBRARIES += lib32/libcrtdll_extra.a lib32/libmsvcrt10_extra.a lib32/libmsvcrt20_extra.a lib32/libmsvcrt40_extra.a lib32/libmsvcrt_common.a lib32/libmsvcrt_extra.a lib32/libmsvcr70_extra.a lib32/libmsvcr71_extra.a lib32/libmsvcr120_app_extra.a lib32/libucrt_extra.a lib32/libucrtapp_extra.a
4949
lib32_libcrtdll_extra_a_SOURCES = $(src_crtdll)
50-
@@ -1264,7 +1274,7 @@ lib64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
50+
@@ -1275,7 +1285,7 @@ lib64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
5151

5252
processed_defs += lib64/msvcrt.def lib64/msvcr80.def lib64/msvcr90.def lib64/msvcr90d.def \
5353
lib64/msvcr100.def lib64/msvcr110.def lib64/msvcr120.def lib64/msvcr120d.def \
@@ -56,7 +56,7 @@ index 1111111..2222222 100644
5656
lib64/advapi32.def lib64/clbcatq.def lib64/kernel32.def lib64/ole32.def \
5757
lib64/oleaut32.def lib64/user32.def lib64/ws2_32.def \
5858
lib64/api-ms-win-crt-math-l1-1-0.def lib64/api-ms-win-crt-private-l1-1-0.def lib64/api-ms-win-crt-runtime-l1-1-0.def \
59-
@@ -1313,6 +1323,10 @@ lib64_DATA += lib64/libucrtbase.a
59+
@@ -1324,6 +1334,10 @@ lib64_DATA += lib64/libucrtbase.a
6060
lib64/libucrtbase.a: lib-common/ucrtbase.mri lib64/libucrtbase_def.a lib64/libucrt_extra.a
6161
cd $(dir $@) && $(AR) -M < $(abspath $<)
6262

@@ -67,7 +67,7 @@ index 1111111..2222222 100644
6767
lib64_DATA += lib64/libucrt.a lib64/libucrtapp.a
6868
noinst_LIBRARIES += lib64/libmsvcrt_common.a lib64/libmsvcrt_extra.a lib64/libmsvcr80_extra.a lib64/libmsvcr120_app_extra.a lib64/libucrt_extra.a lib64/libucrtapp_extra.a
6969
lib64_libmsvcrt_common_a_SOURCES = $(src_msvcrt_common)
70-
@@ -1592,7 +1606,7 @@ libarm32_LIBRARIES += libarm32/libmingwthrd.a
70+
@@ -1607,7 +1621,7 @@ libarm32_LIBRARIES += libarm32/libmingwthrd.a
7171
libarm32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
7272
libarm32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
7373

@@ -76,7 +76,7 @@ index 1111111..2222222 100644
7676
libarm32/advapi32.def libarm32/clbcatq.def libarm32/kernel32.def libarm32/ole32.def libarm32/oleaut32.def \
7777
libarm32/user32.def libarm32/ws2_32.def \
7878
libarm32/api-ms-win-crt-math-l1-1-0.def libarm32/api-ms-win-crt-private-l1-1-0.def libarm32/api-ms-win-crt-runtime-l1-1-0.def \
79-
@@ -1617,6 +1631,10 @@ libarm32_DATA += libarm32/libucrtbase.a
79+
@@ -1632,6 +1646,10 @@ libarm32_DATA += libarm32/libucrtbase.a
8080
libarm32/libucrtbase.a: lib-common/ucrtbase.mri libarm32/libucrtbase_def.a libarm32/libucrt_extra.a
8181
cd $(dir $@) && $(AR) -M < $(abspath $<)
8282

@@ -87,7 +87,7 @@ index 1111111..2222222 100644
8787
libarm32_DATA += libarm32/libucrt.a libarm32/libucrtapp.a
8888
noinst_LIBRARIES += libarm32/libmsvcrt_common.a libarm32/libmsvcrt_extra.a libarm32/libmsvcr120_app_extra.a libarm32/libucrt_extra.a libarm32/libucrtapp_extra.a
8989
libarm32_libmsvcrt_common_a_SOURCES = $(src_msvcrt_common)
90-
@@ -1874,7 +1892,7 @@ libarm64_LIBRARIES += libarm64/libmingwthrd.a
90+
@@ -1893,7 +1911,7 @@ libarm64_LIBRARIES += libarm64/libmingwthrd.a
9191
libarm64_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
9292
libarm64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM64) $(sysincludes)
9393

@@ -96,7 +96,7 @@ index 1111111..2222222 100644
9696
libarm64/advapi32.def libarm64/clbcatq.def libarm64/kernel32.def libarm64/ole32.def libarm64/oleaut32.def \
9797
libarm64/user32.def libarm64/ws2_32.def \
9898
libarm64/api-ms-win-crt-math-l1-1-0.def libarm64/api-ms-win-crt-private-l1-1-0.def libarm64/api-ms-win-crt-runtime-l1-1-0.def \
99-
@@ -1889,6 +1907,10 @@ libarm64_DATA += libarm64/libucrtbase.a
99+
@@ -1908,6 +1926,10 @@ libarm64_DATA += libarm64/libucrtbase.a
100100
libarm64/libucrtbase.a: lib-common/ucrtbase.mri libarm64/libucrtbase_def.a libarm64/libucrt_extra.a
101101
cd $(dir $@) && $(AR) -M < $(abspath $<)
102102

@@ -190,7 +190,7 @@ index 1111111..2222222 100644
190190
@LIBARM64_TRUE@@W32API_FALSE@ libarm64/libucrt.a \
191191
@LIBARM64_TRUE@@W32API_FALSE@ libarm64/libucrtapp.a \
192192
@LIBARM64_TRUE@@W32API_FALSE@ libarm64/libvcruntime140_app.a
193-
@@ -10389,7 +10393,7 @@ d3dcsxd = d3dcsxd_43
193+
@@ -10451,7 +10455,7 @@ d3dcsxd = d3dcsxd_43
194194
d3dcompiler = d3dcompiler_47
195195

196196
# can move this into libsrc/dummy_libm.c or similar
@@ -199,7 +199,7 @@ index 1111111..2222222 100644
199199
src_libm = _libm_dummy.c
200200
@ENABLE_DFP_FALSE@src_dfp_math =
201201
@ENABLE_DFP_TRUE@src_dfp_math = \
202-
@@ -77886,6 +77890,12 @@ uninstall-am: uninstall-crt32DATA uninstall-crt64DATA \
202+
@@ -78216,6 +78220,12 @@ uninstall-am: uninstall-crt32DATA uninstall-crt64DATA \
203203

204204
_libm_dummy.c:
205205
echo "static int __attribute__((unused)) __mingw_libm_dummy;" > _libm_dummy.c
@@ -212,7 +212,7 @@ index 1111111..2222222 100644
212212
@LIB32_TRUE@lib32/crt1.o: crt/crtexe.c
213213
@LIB32_TRUE@ $(COMPILE32) -c $< -o $@
214214
@LIB32_TRUE@lib32/crt2.o: lib32/crt1.o
215-
@@ -77942,6 +77952,8 @@ _libm_dummy.c:
215+
@@ -78272,6 +78282,8 @@ _libm_dummy.c:
216216
@LIB32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<)
217217
@LIB32_TRUE@@W32API_FALSE@lib32/libucrtbase.a: lib-common/ucrtbase.mri lib32/libucrtbase_def.a lib32/libucrt_extra.a
218218
@LIB32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<)
@@ -221,7 +221,7 @@ index 1111111..2222222 100644
221221

222222
@LIB32_TRUE@lib32/lib%.a: lib32/%.def
223223
@LIB32_TRUE@ $(DTDEF32) $<
224-
@@ -78015,6 +78027,8 @@ _libm_dummy.c:
224+
@@ -78345,6 +78357,8 @@ _libm_dummy.c:
225225
@LIB64_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<)
226226
@LIB64_TRUE@@W32API_FALSE@lib64/libucrtbase.a: lib-common/ucrtbase.mri lib64/libucrtbase_def.a lib64/libucrt_extra.a
227227
@LIB64_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<)
@@ -230,7 +230,7 @@ index 1111111..2222222 100644
230230

231231
@LIB64_TRUE@lib64/lib%.a: lib64/%.def
232232
@LIB64_TRUE@ $(DTDEF64) $<
233-
@@ -78076,6 +78090,8 @@ _libm_dummy.c:
233+
@@ -78406,6 +78420,8 @@ _libm_dummy.c:
234234
@LIBARM32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<)
235235
@LIBARM32_TRUE@@W32API_FALSE@libarm32/libucrtbase.a: lib-common/ucrtbase.mri libarm32/libucrtbase_def.a libarm32/libucrt_extra.a
236236
@LIBARM32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<)
@@ -239,7 +239,7 @@ index 1111111..2222222 100644
239239

240240
@LIBARM32_TRUE@libarm32/lib%.a: libarm32/%.def
241241
@LIBARM32_TRUE@ $(DTDEFARM32) $<
242-
@@ -78121,6 +78137,8 @@ _libm_dummy.c:
242+
@@ -78451,6 +78467,8 @@ _libm_dummy.c:
243243
@LIBARM64_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<)
244244
@LIBARM64_TRUE@@W32API_FALSE@libarm64/libucrtbase.a: lib-common/ucrtbase.mri libarm64/libucrtbase_def.a libarm64/libucrt_extra.a
245245
@LIBARM64_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<)

‎build/patches/mxe-fixes.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ index 1111111..2222222 100644
233233
#include <ffi.h>
234234

235235
-int main(int argc, char *argv[])
236-
+int main()
236+
+int main(void)
237237
{
238238
ffi_cif cif;
239239
ffi_type *args[1];

‎build/plugins/gcc/rust-std-i686.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PKG := rust-std-i686
22
$(PKG)_WEBSITE := https://www.rust-lang.org/
33
$(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency.
44
$(PKG)_IGNORE :=
5-
# https://static.rust-lang.org/dist/rust-1.60.0-i686-pc-windows-gnu.tar.gz.sha256
6-
$(PKG)_VERSION := 1.60.0
7-
$(PKG)_CHECKSUM := 4c38aa4b1030e8876ec612a257a09f0a61b51006272fc1490db0addf526fe1dc
5+
# https://static.rust-lang.org/dist/rust-1.63.0-i686-pc-windows-gnu.tar.xz.sha256
6+
$(PKG)_VERSION := 1.63.0
7+
$(PKG)_CHECKSUM := 54f6fad9a298b5920cefbbd9aba6111e058a462bd14e67f6bdebcda95f1dde4e
88
$(PKG)_SUBDIR := rust-$($(PKG)_VERSION)-i686-pc-windows-gnu/rust-std-i686-pc-windows-gnu
9-
$(PKG)_FILE := rust-$($(PKG)_VERSION)-i686-pc-windows-gnu.tar.gz
9+
$(PKG)_FILE := rust-$($(PKG)_VERSION)-i686-pc-windows-gnu.tar.xz
1010
$(PKG)_URL := https://static.rust-lang.org/dist/$($(PKG)_FILE)
1111
$(PKG)_TYPE := source-only

‎build/plugins/gcc/rust-std-x86_64.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PKG := rust-std-x86_64
22
$(PKG)_WEBSITE := https://www.rust-lang.org/
33
$(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency.
44
$(PKG)_IGNORE :=
5-
# https://static.rust-lang.org/dist/rust-1.60.0-x86_64-pc-windows-gnu.tar.gz.sha256
6-
$(PKG)_VERSION := 1.60.0
7-
$(PKG)_CHECKSUM := d4b8692b437af2bc23b455503d6eb9656dbf7cd25fb7bb78bee0846b8ef22d26
5+
# https://static.rust-lang.org/dist/rust-1.63.0-x86_64-pc-windows-gnu.tar.xz.sha256
6+
$(PKG)_VERSION := 1.63.0
7+
$(PKG)_CHECKSUM := ff44c19a81cdd8487d46584238de2a45cf8129dc38569e95fac1ab704a860bac
88
$(PKG)_SUBDIR := rust-$($(PKG)_VERSION)-x86_64-pc-windows-gnu/rust-std-x86_64-pc-windows-gnu
9-
$(PKG)_FILE := rust-$($(PKG)_VERSION)-x86_64-pc-windows-gnu.tar.gz
9+
$(PKG)_FILE := rust-$($(PKG)_VERSION)-x86_64-pc-windows-gnu.tar.xz
1010
$(PKG)_URL := https://static.rust-lang.org/dist/$($(PKG)_FILE)
1111
$(PKG)_TYPE := source-only

‎build/plugins/gcc/rust.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ PKG := rust
22
$(PKG)_WEBSITE := https://www.rust-lang.org/
33
$(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency.
44
$(PKG)_IGNORE :=
5-
# https://static.rust-lang.org/dist/rust-1.60.0-x86_64-unknown-linux-gnu.tar.gz.sha256
6-
$(PKG)_VERSION := 1.60.0
7-
$(PKG)_CHECKSUM := b8a4c3959367d053825e31f90a5eb86418eb0d80cacda52bfa80b078e18150d5
5+
# https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz.sha256
6+
$(PKG)_VERSION := 1.63.0
7+
$(PKG)_CHECKSUM := be9b25bcf1e564876762e653688e0b5df11fab53048ac18bf77761cf0a0cc465
88
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-x86_64-unknown-linux-gnu
9-
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-x86_64-unknown-linux-gnu.tar.gz
9+
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-x86_64-unknown-linux-gnu.tar.xz
1010
$(PKG)_URL := https://static.rust-lang.org/dist/$($(PKG)_FILE)
1111
$(PKG)_DEPS := $(foreach TARGET,$(MXE_TARGETS),rust-std-$(firstword $(call split,-,$(TARGET))))
1212

‎build/plugins/llvm-mingw/compiler-rt-sanitizers.mk‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
PKG := compiler-rt-sanitizers
44
$(PKG)_WEBSITE := https://compiler-rt.llvm.org/
5-
$(PKG)_VERSION := 14.0.5
5+
$(PKG)_VERSION := 15.0.0
66
$(PKG)_DEPS := cc
77
$(PKG)_TYPE := meta
88

@@ -21,9 +21,12 @@ define $(PKG)_BUILD
2121
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \
2222
-DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE \
2323
-DCOMPILER_RT_BUILD_BUILTINS=FALSE \
24+
-DCOMPILER_RT_BUILD_CRT=FALSE \
25+
-DCOMPILER_RT_BUILD_XRAY=FALSE \
2426
-DCOMPILER_RT_BUILD_LIBFUZZER=FALSE \
2527
-DCOMPILER_RT_BUILD_PROFILE=FALSE \
2628
-DCOMPILER_RT_BUILD_MEMPROF=FALSE \
29+
-DCOMPILER_RT_BUILD_ORC=FALSE \
2730
-DSANITIZER_CXX_ABI=libc++ \
2831
$(if $(BUILD_STATIC), -DCMAKE_REQUIRED_LIBRARIES='unwind')
2932
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'

0 commit comments

Comments
 (0)