me/guix
Archived
1
0
Fork 0
Code Activity

gnu: RHash: Move custom configure logic to #:configure-flags.

Browse source 
* gnu/packages/crypto.scm (rhash)[arguments]: Add #:configure-flags.  Adjust
the 'configure' phase accordingly.
This commit is contained in:
Marius Bakke 2020-01-31 09:47:41 +01:00
parent 2401678f56
commit d2a4020a01
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/crypto.scm
View file

@ -720,7 +720,16 @@ BLAKE.")
"1xn9fqa6rlnhsbgami45g82dlw9i1skg2sri3ydiinwak5ph1ca2")))) "1xn9fqa6rlnhsbgami45g82dlw9i1skg2sri3ydiinwak5ph1ca2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (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. ;; The binaries in /bin need some help finding librhash.so.0.
(list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
#:test-target "test" ; ‘make check’ just checks the sources #:test-target "test" ; ‘make check’ just checks the sources
@ -729,16 +738,8 @@ BLAKE.")
(replace 'configure (replace 'configure
;; ./configure is not GNU autotools' and doesn't gracefully handle ;; ./configure is not GNU autotools' and doesn't gracefully handle
;; unrecognized options, so we must call it manually. ;; unrecognized options, so we must call it manually.
(lambda* (#:key native-inputs outputs #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)
(invoke "./configure" (apply invoke "./configure" configure-flags)))
(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"))
'())))))
(add-before 'check 'patch-/bin/sh (add-before 'check 'patch-/bin/sh
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"