GNU bug report logs -
#46096
[PATCH] gnu: make-mingw-w64: Use mirror:// link and fix lint errors.
Previous Next
Reported by: Léo Le Bouter <lle-bout <at> zaclys.net>
Date: Mon, 25 Jan 2021 10:52:01 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 46096 in the body.
You can then email your comments to 46096 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#46096; Package
guix-patches.
(Mon, 25 Jan 2021 10:52:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Léo Le Bouter <lle-bout <at> zaclys.net>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Mon, 25 Jan 2021 10:52:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/package/mingw.scm (make-mingw-w64): Use mirror:// link instead of
hardcoded sourceforge.net. Wrap lines 80 columns to fix lint warning.
---
gnu/packages/mingw.scm | 49 +++++++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index b37f6c69bd..58f01ddc9f 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -46,23 +46,26 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
(name (string-append "mingw-w64" "-" machine
(if with-winpthreads? "-winpthreads" "")))
(version "7.0.0")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/"
- "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
- (sha256
- (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a"))
- (patches
- (search-patches "mingw-w64-6.0.0-gcc.patch"
- "mingw-w64-dlltool-temp-prefix.patch"
- "mingw-w64-reproducible-gendef.patch"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://sourceforge/mingw-w64/mingw-w64/"
+ "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
+ (sha256
+ (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a"))
+ (patches
+ (search-patches "mingw-w64-6.0.0-gcc.patch"
+ "mingw-w64-dlltool-temp-prefix.patch"
+ "mingw-w64-reproducible-gendef.patch"))))
(native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet)))
- ("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet)))
+ ("xbinutils" ,(if xbinutils xbinutils
+ (cross-binutils triplet)))
,@(if with-winpthreads?
- `(("xlibc" ,(make-mingw-w64 machine
- #:xgcc xgcc
- #:xbinutils xbinutils)))
+ `(("xlibc" ,(make-mingw-w64
+ machine
+ #:xgcc xgcc
+ #:xbinutils xbinutils)))
'())))
(build-system gnu-build-system)
(search-paths
@@ -85,9 +88,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
(add-before 'configure 'setenv
(lambda* (#:key inputs #:allow-other-keys)
(let ((xgcc-core (assoc-ref inputs "xgcc-core"))
- (mingw-headers (string-append (getcwd) "/mingw-w64-headers")))
+ (mingw-headers (string-append
+ (getcwd) "/mingw-w64-headers")))
(setenv "CPP"
- (string-append xgcc-core ,(string-append "/bin/" triplet "-cpp")))
+ (string-append
+ xgcc-core ,(string-append "/bin/" triplet "-cpp")))
(setenv "CROSS_C_INCLUDE_PATH"
(string-append
mingw-headers
@@ -96,11 +101,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
":" mingw-headers "/defaults/include"
":" mingw-headers "/direct-x/include"))
(when ,with-winpthreads?
- (let ((xlibc (assoc-ref inputs "xlibc")))
- (setenv "CROSS_LIBRARY_PATH"
- (string-append
- xlibc "/lib" ":"
- xlibc "/" ,triplet "/lib"))))))))
+ (let ((xlibc (assoc-ref inputs "xlibc")))
+ (setenv "CROSS_LIBRARY_PATH"
+ (string-append
+ xlibc "/lib" ":"
+ xlibc "/" ,triplet "/lib"))))))))
#:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1")
#:tests? #f ; compiles and includes glibc headers
#:strip-binaries? #f))
--
2.30.0
Reply sent
to
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:
You have taken responsibility.
(Wed, 03 Feb 2021 15:28:01 GMT)
Full text and
rfc822 format available.
Notification sent
to
Léo Le Bouter <lle-bout <at> zaclys.net>:
bug acknowledged by developer.
(Wed, 03 Feb 2021 15:28:01 GMT)
Full text and
rfc822 format available.
Message #10 received at 46096-done <at> debbugs.gnu.org (full text, mbox):
Hello,
Léo Le Bouter <lle-bout <at> zaclys.net> writes:
> * gnu/package/mingw.scm (make-mingw-w64): Use mirror:// link instead of
> hardcoded sourceforge.net. Wrap lines 80 columns to fix lint warning.
> ---
> gnu/packages/mingw.scm | 49 +++++++++++++++++++++++-------------------
> 1 file changed, 27 insertions(+), 22 deletions(-)
>
> diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
> index b37f6c69bd..58f01ddc9f 100644
> --- a/gnu/packages/mingw.scm
> +++ b/gnu/packages/mingw.scm
> @@ -46,23 +46,26 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
> (name (string-append "mingw-w64" "-" machine
> (if with-winpthreads? "-winpthreads" "")))
> (version "7.0.0")
> - (source (origin
> - (method url-fetch)
> - (uri (string-append
> - "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/"
> - "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
> - (sha256
> - (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a"))
> - (patches
> - (search-patches "mingw-w64-6.0.0-gcc.patch"
> - "mingw-w64-dlltool-temp-prefix.patch"
> - "mingw-w64-reproducible-gendef.patch"))))
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "mirror://sourceforge/mingw-w64/mingw-w64/"
> + "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
> + (sha256
> + (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a"))
> + (patches
> + (search-patches "mingw-w64-6.0.0-gcc.patch"
> + "mingw-w64-dlltool-temp-prefix.patch"
> + "mingw-w64-reproducible-gendef.patch"))))
> (native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet)))
> - ("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet)))
> + ("xbinutils" ,(if xbinutils xbinutils
> + (cross-binutils triplet)))
> ,@(if with-winpthreads?
> - `(("xlibc" ,(make-mingw-w64 machine
> - #:xgcc xgcc
> - #:xbinutils xbinutils)))
> + `(("xlibc" ,(make-mingw-w64
> + machine
> + #:xgcc xgcc
> + #:xbinutils xbinutils)))
> '())))
> (build-system gnu-build-system)
> (search-paths
> @@ -85,9 +88,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
> (add-before 'configure 'setenv
> (lambda* (#:key inputs #:allow-other-keys)
> (let ((xgcc-core (assoc-ref inputs "xgcc-core"))
> - (mingw-headers (string-append (getcwd) "/mingw-w64-headers")))
> + (mingw-headers (string-append
> + (getcwd) "/mingw-w64-headers")))
> (setenv "CPP"
> - (string-append xgcc-core ,(string-append "/bin/" triplet "-cpp")))
> + (string-append
> + xgcc-core ,(string-append "/bin/" triplet "-cpp")))
> (setenv "CROSS_C_INCLUDE_PATH"
> (string-append
> mingw-headers
> @@ -96,11 +101,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
> ":" mingw-headers "/defaults/include"
> ":" mingw-headers "/direct-x/include"))
> (when ,with-winpthreads?
> - (let ((xlibc (assoc-ref inputs "xlibc")))
> - (setenv "CROSS_LIBRARY_PATH"
> - (string-append
> - xlibc "/lib" ":"
> - xlibc "/" ,triplet "/lib"))))))))
> + (let ((xlibc (assoc-ref inputs "xlibc")))
> + (setenv "CROSS_LIBRARY_PATH"
> + (string-append
> + xlibc "/lib" ":"
> + xlibc "/" ,triplet "/lib"))))))))
> #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1")
> #:tests? #f ; compiles and includes glibc headers
> #:strip-binaries? #f))
Pushed as commit 88c635d96a1dfba90278dd9a3c2fcf523c74b55c, thank you.
Maxim
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Thu, 04 Mar 2021 12:24:10 GMT)
Full text and
rfc822 format available.
This bug report was last modified 3 years and 48 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.