diff options
| author | Jean-Pierre De Jesus DIAZ <jean@foundation.xyz> | 2024-06-18 13:26:15 +0200 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-07-15 22:34:25 +0100 |
| commit | 17188be0f723e00377b21b767f5447d7938a116e (patch) | |
| tree | 3ba6e565b0124b4f0d043dbf159c57c4179b82cf /gnu/packages/mingw.scm | |
| parent | ce578830e6798e65f21ba713d3c1193895999286 (diff) | |
| download | guix-17188be0f723e00377b21b767f5447d7938a116e.tar guix-17188be0f723e00377b21b767f5447d7938a116e.tar.gz | |
gnu: make-mingw-w64: Update to 12.0.0.
* gnu/packages/mingw.scm (make-mingw-w64): Update to 12.0.0.
* gnu/packages/patches/mingw-w64-6.0.0-gcc.patch: Delete patch.
* gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch: Delete patch.
* gnu/packages/patches/mingw-w64-reproducible-gendef.patch: Delete patch.
* gnu/local.mk: Unregister patches.
Change-Id: Id9d7d17926280b21016a7217da44004e06e436cd
Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'gnu/packages/mingw.scm')
| -rw-r--r-- | gnu/packages/mingw.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index bae1561546..8a8a885446 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -43,7 +43,7 @@ specified, recurse and return a mingw-w64 with support for winpthreads." (package (name (string-append "mingw-w64" "-" machine (if with-winpthreads? "-winpthreads" ""))) - (version "11.0.1") + (version "12.0.0") (source (origin (method url-fetch) @@ -51,11 +51,7 @@ specified, recurse and return a mingw-w64 with support for winpthreads." "mirror://sourceforge/mingw-w64/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz")) - (patches - (search-patches "mingw-w64-6.0.0-gcc.patch" - "mingw-w64-dlltool-temp-prefix.patch" - "mingw-w64-reproducible-gendef.patch")))) + (base32 "0bzdprdrb8jy5dhkl2j2yhnr2nsiv6wk2wzxrzaqsvjbmj58jhfc")))) (native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet))) ("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet))) @@ -84,7 +80,14 @@ specified, recurse and return a mingw-w64 with support for winpthreads." #~(list #$(string-append "--host=" triplet) #$@(if with-winpthreads? #~("--with-libraries=winpthreads") - #~())) + #~()) + ;; The default msvcrt changed on 12.0.0 to use UCRT as the + ;; default, this could cause problems with programs expecting + ;; MSVCRT as the default. + ;; + ;; XXX: A new target to use UCRT can be introduced as + ;; the MSYS2 project does, e.g: x86_64-w64-ucrt-mingw32. + "--with-default-msvcrt=msvcrt") #:make-flags #~'("DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") #:phases #~(modify-phases %standard-phases |