[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/44: build-system/haskell: Refactor configure step.
From: |
guix-commits |
Subject: |
03/44: build-system/haskell: Refactor configure step. |
Date: |
Thu, 13 Aug 2020 09:26:27 -0400 (EDT) |
rekado pushed a commit to branch wip-haskell
in repository guix.
commit 0347888a7ec3a11c050c4269533c8d69197a4c6e
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed Jun 24 23:12:06 2020 +0200
build-system/haskell: Refactor configure step.
* guix/build/haskell-build-system.scm (configure): Replace append
with quasiquotes and splicing.
---
guix/build/haskell-build-system.scm | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/guix/build/haskell-build-system.scm
b/guix/build/haskell-build-system.scm
index 5fd0c7d..a8cd62d 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -85,25 +85,22 @@ and parameters ~s~%"
dir)
(_ '())))
(ghc-path (getenv "GHC_PACKAGE_PATH"))
- (params (append `(,(string-append "--prefix=" out))
- `(,(string-append "--libdir=" (or lib out) "/lib"))
- `(,(string-append "--bindir=" (or bin out) "/bin"))
- `(,(string-append
- "--docdir=" (or doc out)
- "/share/doc/" name-version))
- '("--libsubdir=$compiler/$pkg-$version")
- `(,(string-append "--package-db=" %tmp-db-dir))
- '("--global")
- `(,@(map
- (cut string-append "--extra-include-dirs=" <>)
- (search-path-as-list '("include") input-dirs)))
- `(,@(map
- (cut string-append "--extra-lib-dirs=" <>)
- (search-path-as-list '("lib") input-dirs)))
- (if tests?
- '("--enable-tests")
- '())
- configure-flags)))
+ (params `(,(string-append "--prefix=" out)
+ ,(string-append "--libdir=" (or lib out) "/lib")
+ ,(string-append "--bindir=" (or bin out) "/bin")
+ ,(string-append "--docdir=" (or doc out)
+ "/share/doc/" name-version)
+ "--libsubdir=$compiler/$pkg-$version"
+ ,(string-append "--package-db=" %tmp-db-dir)
+ "--global"
+ ,@(map (cut string-append "--extra-include-dirs=" <>)
+ (search-path-as-list '("include") input-dirs))
+ ,@(map (cut string-append "--extra-lib-dirs=" <>)
+ (search-path-as-list '("lib") input-dirs))
+ ,@(if tests?
+ '("--enable-tests")
+ '())
+ ,@configure-flags)))
;; Cabal errors if GHC_PACKAGE_PATH is set during 'configure', so unset
;; and restore it.
(unsetenv "GHC_PACKAGE_PATH")
- branch wip-haskell created (now 79fe1d9), guix-commits, 2020/08/13
- 02/44: build-system/haskell: Support parallel builds., guix-commits, 2020/08/13
- 05/44: build-system/haskell: Add default output "static"., guix-commits, 2020/08/13
- 01/44: gnu: Add ghc-8.8., guix-commits, 2020/08/13
- 08/44: build-system/haskell: Add 'extra-directories' keyword., guix-commits, 2020/08/13
- 10/44: gnu: Add "static" output to Haskell packages with custom outputs., guix-commits, 2020/08/13
- 11/44: gnu: ghc-8.6: Remove unnecessary references., guix-commits, 2020/08/13
- 15/44: gnu: ghc-blaze-html: Add "doc" output., guix-commits, 2020/08/13
- 16/44: gnu: ghc-aeson: Add "doc" output., guix-commits, 2020/08/13
- 04/44: build-system/haskell: Configure to link with shared libraries., guix-commits, 2020/08/13
- 03/44: build-system/haskell: Refactor configure step.,
guix-commits <=
- 06/44: haskell-build-system: register: Respect lib output., guix-commits, 2020/08/13
- 07/44: haskell-build-system: register: Remove references to the doc output., guix-commits, 2020/08/13
- 09/44: build-system/haskell: Do not pass "--bindir" during configure., guix-commits, 2020/08/13
- 12/44: gnu: ghc-hspec: Add "doc" output., guix-commits, 2020/08/13
- 13/44: gnu: ghc-crypto-api-tests: Add "doc" output., guix-commits, 2020/08/13
- 14/44: gnu: ghc-cryptonite: Add "doc" output., guix-commits, 2020/08/13
- 19/44: gnu: ghc-basement: Add "doc" output., guix-commits, 2020/08/13
- 21/44: gnu: ghc-cmdargs: Add "doc" output., guix-commits, 2020/08/13
- 26/44: gnu: ghc-generic-deriving: Add "doc" output., guix-commits, 2020/08/13
- 27/44: gnu: ghc-generics-sop: Add "doc" output., guix-commits, 2020/08/13