me
/
guix
Archived
1
0
Fork 0
Code

gnu: make-mingw-w64: Use a mirror URI and fix lint errors. 

* gnu/package/mingw.scm (make-mingw-w64)[source]: Use a mirror URI.  Wrap
lines 80 columns to fix lint warning.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
master
Léo Le Bouter 2021-01-25 11:51:21 +01:00 committed by Maxim Cournoyer
parent 3d433441b1
commit 88c635d96a
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gnu/packages/mingw.scm
View File

@ -46,23 +46,26 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
(name (string-append "mingw-w64" "-" machine (name (string-append "mingw-w64" "-" machine
(if with-winpthreads? "-winpthreads" ""))) (if with-winpthreads? "-winpthreads" "")))
(version "7.0.0") (version "7.0.0")
(source (origin (source
(method url-fetch) (origin
(uri (string-append (method url-fetch)
"https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" (uri (string-append
"mingw-w64-release/mingw-w64-v" version ".tar.bz2")) "mirror://sourceforge/mingw-w64/mingw-w64/"
(sha256 "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
(base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a")) (sha256
(patches (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a"))
(search-patches "mingw-w64-6.0.0-gcc.patch" (patches
"mingw-w64-dlltool-temp-prefix.patch" (search-patches "mingw-w64-6.0.0-gcc.patch"
"mingw-w64-reproducible-gendef.patch")))) "mingw-w64-dlltool-temp-prefix.patch"
"mingw-w64-reproducible-gendef.patch"))))
(native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet))) (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? ,@(if with-winpthreads?
`(("xlibc" ,(make-mingw-w64 machine `(("xlibc" ,(make-mingw-w64
#:xgcc xgcc machine
#:xbinutils xbinutils))) #:xgcc xgcc
#:xbinutils xbinutils)))
'()))) '())))
(build-system gnu-build-system) (build-system gnu-build-system)
(search-paths (search-paths
@ -85,9 +88,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
(add-before 'configure 'setenv (add-before 'configure 'setenv
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((xgcc-core (assoc-ref inputs "xgcc-core")) (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" (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" (setenv "CROSS_C_INCLUDE_PATH"
(string-append (string-append
mingw-headers mingw-headers
@ -96,11 +101,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
":" mingw-headers "/defaults/include" ":" mingw-headers "/defaults/include"
":" mingw-headers "/direct-x/include")) ":" mingw-headers "/direct-x/include"))
(when ,with-winpthreads? (when ,with-winpthreads?
(let ((xlibc (assoc-ref inputs "xlibc"))) (let ((xlibc (assoc-ref inputs "xlibc")))
(setenv "CROSS_LIBRARY_PATH" (setenv "CROSS_LIBRARY_PATH"
(string-append (string-append
xlibc "/lib" ":" xlibc "/lib" ":"
xlibc "/" ,triplet "/lib")))))))) xlibc "/" ,triplet "/lib"))))))))
#:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1")
#:tests? #f ; compiles and includes glibc headers #:tests? #f ; compiles and includes glibc headers
#:strip-binaries? #f)) #:strip-binaries? #f))