ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-mingw-w64: Use G-Expressions.

Browse source 
* gnu/packages/mingw.scm (make-mingw-w64): Use G-Expressions and
move some arguments above phases.

Change-Id: Ie095dceac635f19f146895c8e3f36d9889108a9a
Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Jean-Pierre De Jesus DIAZ 2024-06-18 13:26:14 +02:00 committed by Christopher Baines
parent 4baaa56e37
commit ce578830e6
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 36 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
gnu/packages/mingw.scm
View file

@ -25,6 +25,7 @@ (define-module (gnu packages mingw)
#:use-module (gnu packages)
#:use-module (gnu packages cross-base)
#:use-module (guix build-system gnu)
#:use-module (guix gexp)
#:use-module (guix memoization)
#:use-module (guix packages)
#:use-module (guix download)
@ -76,37 +77,41 @@ (define* (make-mingw-w64/implementation machine
,(string-append triplet "/lib")
,(string-append triplet "/lib64"))))))
(arguments
`(#:configure-flags '(,(string-append "--host=" triplet)
,@(if with-winpthreads?
'("--with-libraries=winpthreads")
'()))
#:phases
(modify-phases %standard-phases
(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")))
(setenv "CPP"
(string-append
xgcc-core ,(string-append "/bin/" triplet "-cpp")))
(setenv "CROSS_C_INCLUDE_PATH"
(string-append
mingw-headers
":" mingw-headers "/include"
":" mingw-headers "/crt"
":" 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"))))))))
#: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))
(list #:parallel-build? #f ; parallel builds often fail with empty .a files
#:tests? #f ; compiles and includes glibc headers
#:strip-binaries? #f
#:configure-flags
#~(list #$(string-append "--host=" triplet)
#$@(if with-winpthreads?
#~("--with-libraries=winpthreads")
#~()))
#:make-flags #~'("DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1")
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'setenv
(lambda _
(let ((xgcc-core #+(this-package-native-input
"xgcc-core"))
(mingw-headers (string-append
(getcwd) "/mingw-w64-headers")))
(setenv "CPP"
(string-append
xgcc-core "/bin/" #$triplet "-cpp"))
(setenv "CROSS_C_INCLUDE_PATH"
(string-append
mingw-headers
":" mingw-headers "/include"
":" mingw-headers "/crt"
":" mingw-headers "/defaults/include"
":" mingw-headers "/direct-x/include"))
#$@(if with-winpthreads?
#~((let ((xlibc #+(this-package-native-input
"xlibc")))
(setenv "CROSS_LIBRARY_PATH"
(string-append
xlibc "/lib" ":"
xlibc "/" #$triplet "/lib"))))
#~())))))))
(home-page "https://mingw-w64.org")
(synopsis "Minimalist GNU for Windows")
(description