[PATCH] gnu: mingw: Update to 10.0.0.

DoneSubmitted by Kaelyn Takata.
Details
2 participants
  • Kaelyn Takata
  • Ludovic Courtès
Owner
unassigned
Severity
normal
K
K
Kaelyn Takata wrote on 17 Jul 19:20 +0200
(address . guix-patches@gnu.org)(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)
268e4429435f2d3135d2df1fb0abba51ca1e8482.1658076669.git.kaelyn.alexi@protonmail.com
* gnu/packages/mingw.scm (mingw): Update to 10.0.0.
---
gnu/packages/mingw.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index 87a565059e..60c01499dd 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -46,7 +46,7 @@ (define* (make-mingw-w64 machine
     (package
       (name (string-append "mingw-w64" "-" machine
                            (if with-winpthreads? "-winpthreads" "")))
-      (version "8.0.0")
+      (version "10.0.0")
       (source
        (origin
          (method url-fetch)
@@ -54,7 +54,7 @@ (define* (make-mingw-w64 machine
                "mirror://sourceforge/mingw-w64/mingw-w64/"
                "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
          (sha256
-          (base32 "0qjpb9rviasfshk337j5r32ncmrwml8sv6qnmb1lp4mkdbm41is4"))
+          (base32 "15089y4rlj6g1m2m3cm3awndw3rbzhznl7skd0vkmikjxl546sxs"))
          (patches
           (search-patches "mingw-w64-6.0.0-gcc.patch"
                           "mingw-w64-dlltool-temp-prefix.patch"

base-commit: 25354b58742fcd9881a26f10623e7cd24f72420d
--
2.36.1
K
K
Kaelyn wrote on 18 Jul 17:21 +0200
Premature package submission
(name . 56620@debbugs.gnu.org)(address . 56620@debbugs.gnu.org)
es2tyd_WwERwP-Py0uNOiEmC9bWhZ8C3nvQ0NbeDaa-amXA_Dm0H8Y-ij4dJrS7GD0TjG-0QgrJHylDkXicvPLIWcLY_L8zwYniXWh2Zb0g=@protonmail.com
Please disregard this update for now. I thought I had it working a few weeks ago (I had been having trouble sending emails from git, which I discovered trying to send a patch back then), but I may have been mistaken as I am consistently having mingw 10 fail to build. The failure isn't entirely consistent though, so it may take some time to sort out. Sorry for the patch list noise!



Sent with Proton Mail secure email.
K
K
Kaelyn Takata wrote on 18 Jul 20:52 +0200
[PATCH v2 1/2] gnu: mingw: Update to 10.0.0.
(address . 56620@debbugs.gnu.org)(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)
33c7a38e52c69ec50514916ea86402aaffa7b698.1658170309.git.kaelyn.alexi@protonmail.com
* gnu/packages/mingw.scm (mingw): Update to 10.0.0.
[arguments] Disable parallel building to avoid failures trying to access empty
.a files.
---
gnu/packages/mingw.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (32 lines)
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index 87a565059e..161fd4ff93 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -46,7 +46,7 @@ (define* (make-mingw-w64 machine
     (package
       (name (string-append "mingw-w64" "-" machine
                            (if with-winpthreads? "-winpthreads" "")))
-      (version "8.0.0")
+      (version "10.0.0")
       (source
        (origin
          (method url-fetch)
@@ -54,7 +54,7 @@ (define* (make-mingw-w64 machine
                "mirror://sourceforge/mingw-w64/mingw-w64/"
                "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
          (sha256
-          (base32 "0qjpb9rviasfshk337j5r32ncmrwml8sv6qnmb1lp4mkdbm41is4"))
+          (base32 "15089y4rlj6g1m2m3cm3awndw3rbzhznl7skd0vkmikjxl546sxs"))
          (patches
           (search-patches "mingw-w64-6.0.0-gcc.patch"
                           "mingw-w64-dlltool-temp-prefix.patch"
@@ -108,6 +108,7 @@ (define* (make-mingw-w64 machine
                               xlibc "/lib" ":"
                               xlibc "/" ,triplet "/lib"))))))))
          #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1")
+         #:parallel-build? #f ; parallel builds often fail with empty .a files
          #:tests? #f ; compiles and includes glibc headers
          #:strip-binaries? #f))
       (home-page "https://mingw-w64.org")

base-commit: 25354b58742fcd9881a26f10623e7cd24f72420d
--
2.36.1
K
K
Kaelyn Takata wrote on 18 Jul 20:52 +0200
[PATCH v2 2/2] gnu: mingw-w64-tools: Update to 10.0.0.
(address . 56620@debbugs.gnu.org)(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)
4d5043eb4c6d57a045605e9368d819ab1e24fc13.1658170309.git.kaelyn.alexi@protonmail.com
* gnu/packages/mingw.scm (mingw-w64-tools): Update to 10.0.0.
---
gnu/packages/mingw.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index 161fd4ff93..ae8bea1009 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -144,7 +144,7 @@ (define-public mingw-w64 mingw-w64-i686)
 (define-public mingw-w64-tools
   (package
     (name "mingw-w64-tools")
-    (version "8.0.0")
+    (version "10.0.0")
     (source
      (origin
        (method url-fetch)
@@ -152,7 +152,7 @@ (define-public mingw-w64-tools
              "mirror://sourceforge/mingw-w64/mingw-w64/"
              "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
        (sha256
-        (base32 "0qjpb9rviasfshk337j5r32ncmrwml8sv6qnmb1lp4mkdbm41is4"))))
+        (base32 "15089y4rlj6g1m2m3cm3awndw3rbzhznl7skd0vkmikjxl546sxs"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((guix build gnu-build-system)
--
2.36.1
L
L
Ludovic Courtès wrote on 3 Aug 17:18 +0200
Re: bug#56620: [PATCH] gnu: mingw: Update to 10.0.0.
(name . Kaelyn Takata)(address . kaelyn.alexi@protonmail.com)(address . 56620-done@debbugs.gnu.org)
87o7x1s6d9.fsf_-_@gnu.org
Hi,

Kaelyn Takata <kaelyn.alexi@protonmail.com> skribis:

Toggle quote (4 lines)
> * gnu/packages/mingw.scm (mingw): Update to 10.0.0.
> [arguments] Disable parallel building to avoid failures trying to access empty
> .a files.

[...]

Toggle quote (2 lines)
> * gnu/packages/mingw.scm (mingw-w64-tools): Update to 10.0.0.

Applied, thanks!

As discussed on IRC, on master (before the upgrade), linking an
executable fails:

Toggle snippet (31 lines)
$ guix describe
Generation 223 Aug 01 2022 00:30:24 (current)
guix ab59155
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: ab59155c5a38dda7efaceb47c7528578fcf0def4
$ guix build gzip --target=x86_64-w64-mingw32 -n --log-file
https://ci.guix.gnu.org/log/qsyn46vn7cvlhrmbds3666kmqp26as9q-gzip-1.10
$ wget -qO- https://ci.guix.gnu.org/log/qsyn46vn7cvlhrmbds3666kmqp26as9q-gzip-1.10 | gunzip | tail -20
/gnu/store/njkaba9vvqkali96xg47al7pcwjpx2w2-mingw-w64-x86_64-8.0.0/include/string.h:228: undefined reference to `__strcpy_chk'
x86_64-w64-mingw32-ld: gzip.o: in function `strcat':
/gnu/store/njkaba9vvqkali96xg47al7pcwjpx2w2-mingw-w64-x86_64-8.0.0/include/string.h:234: undefined reference to `__strcpy_chk'
x86_64-w64-mingw32-ld: lib/libgzip.a(openat-proc.o): in function `sprintf':
/gnu/store/njkaba9vvqkali96xg47al7pcwjpx2w2-mingw-w64-x86_64-8.0.0/include/stdio.h:372: undefined reference to `__chk_fail'
x86_64-w64-mingw32-ld: lib/libgzip.a(vasnprintf.o): in function `sprintf':
/gnu/store/njkaba9vvqkali96xg47al7pcwjpx2w2-mingw-w64-x86_64-8.0.0/include/stdio.h:372: undefined reference to `__chk_fail'
x86_64-w64-mingw32-ld: /gnu/store/njkaba9vvqkali96xg47al7pcwjpx2w2-mingw-w64-x86_64-8.0.0/include/stdio.h:372: undefined reference to `__chk_fail'
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:1639: gzip.exe] Error 1
make[2]: Leaving directory '/tmp/guix-build-gzip-1.10.drv-0/gzip-1.10'
make[1]: *** [Makefile:1768: all-recursive] Error 1
make[1]: Leaving directory '/tmp/guix-build-gzip-1.10.drv-0/gzip-1.10'
make: *** [Makefile:1549: all] Error 2
error: in phase 'build': uncaught exception:
%exception #<&invoke-error program: "make" arguments: ("-j" "16") exit-status: 2 term-signal: #f stop-signal: #f>
phase `build' failed after 3.5 seconds
command "make" "-j" "16" failed with status 2
builder for `/gnu/store/g573vakmnipxc8454x3aji51fy5gvvpr-gzip-1.10.drv' failed with exit code 1
@ build-failed /gnu/store/g573vakmnipxc8454x3aji51fy5gvvpr-gzip-1.10.drv - 1 builder for `/gnu/store/g573vakmnipxc8454x3aji51fy5gvvpr-gzip-1.10.drv' failed with exit code 1

The bug is still there after the upgrade:

Toggle snippet (27 lines)
CCLD gzip.exe
x86_64-w64-mingw32-ld: gzip.o: in function `strcpy':
/gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:228: undefined reference to `__memcpy_chk'
x86_64-w64-mingw32-ld: /gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:228: undefined reference to `__strcpy_chk'
x86_64-w64-mingw32-ld: /gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:228: undefined reference to `__memcpy_chk'
x86_64-w64-mingw32-ld: /gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:228: undefined reference to `__memcpy_chk'
x86_64-w64-mingw32-ld: /gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:228: undefined reference to `__stpcpy_chk'
x86_64-w64-mingw32-ld: gzip.o: in function `strcat':
/gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:234: undefined reference to `__memcpy_chk'
x86_64-w64-mingw32-ld: gzip.o: in function `strcpy':
/gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:228: undefined reference to `__stpcpy_chk'
x86_64-w64-mingw32-ld: gzip.o: in function `strcat':
/gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:234: undefined reference to `__strcpy_chk'
x86_64-w64-mingw32-ld: gzip.o: in function `strcpy':
/gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:228: undefined reference to `__strcpy_chk'
x86_64-w64-mingw32-ld: gzip.o: in function `strcat':
/gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/string.h:234: undefined reference to `__strcpy_chk'
x86_64-w64-mingw32-ld: lib/libgzip.a(openat-proc.o): in function `sprintf':
/gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/stdio.h:386: undefined reference to `__chk_fail'
x86_64-w64-mingw32-ld: lib/libgzip.a(vasnprintf.o): in function `sprintf':
/gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/stdio.h:386: undefined reference to `__chk_fail'
x86_64-w64-mingw32-ld: /gnu/store/7b119byi86gb3ab5x87ld9fz5xg5bwyd-mingw-w64-x86_64-10.0.0/include/stdio.h:386: undefined reference to `__chk_fail'
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:1639: gzip.exe] Error 1
make[2]: Leaving directory '/tmp/guix-build-gzip-1.10.drv-0/gzip-1.10'

So it’s not a regression, but certainly something we’ll have to address
to make cross-compilation to MinGW useful.

Thanks,
Ludo’.
Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 56620@debbugs.gnu.org