summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-01-31 09:47:41 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-02-03 15:29:15 +0100
commitd2a4020a012e305b425c9bd48e9585c24a606aa7 (patch)
tree67fbf427feb76116a41a81b644859a31e5db2c7d
parent2401678f56695b80b5a46d2aef931afcde278c2c (diff)
gnu: RHash: Move custom configure logic to #:configure-flags.
* gnu/packages/crypto.scm (rhash)[arguments]: Add #:configure-flags. Adjust the 'configure' phase accordingly.
-rw-r--r--gnu/packages/crypto.scm23
1 files changed, 12 insertions, 11 deletions
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 79472847d6..852a262a7c 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -720,7 +720,16 @@ BLAKE.")
"1xn9fqa6rlnhsbgami45g82dlw9i1skg2sri3ydiinwak5ph1ca2"))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags
+ `(#:configure-flags
+ (list (string-append "--prefix=" (assoc-ref %outputs "out"))
+ ,@(let ((target (%current-target-system)))
+ (if target
+ `((string-append "--target=" ,target)
+ (string-append "--cc="
+ (assoc-ref %build-inputs "cross-gcc")
+ "/bin/" ,target "-gcc"))
+ '())))
+ #:make-flags
;; The binaries in /bin need some help finding librhash.so.0.
(list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
#:test-target "test" ; ‘make check’ just checks the sources
@@ -729,16 +738,8 @@ BLAKE.")
(replace 'configure
;; ./configure is not GNU autotools' and doesn't gracefully handle
;; unrecognized options, so we must call it manually.
- (lambda* (#:key native-inputs outputs #:allow-other-keys)
- (invoke "./configure"
- (string-append "--prefix=" (assoc-ref outputs "out"))
- ,@(let ((target (%current-target-system)))
- (if target
- `((string-append "--target=" ,target)
- (string-append "--cc="
- (assoc-ref native-inputs "cross-gcc")
- "/bin/" ,target "-gcc"))
- '())))))
+ (lambda* (#:key configure-flags #:allow-other-keys)
+ (apply invoke "./configure" configure-flags)))
(add-before 'check 'patch-/bin/sh
(lambda _
(substitute* "Makefile"