nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: openssl: Use 'modify-phases'. 

* gnu/packages/tls.scm (openssl)[arguments]: Use 'modify-phases'.
This commit is contained in:
Ludovic Courtès 2015-09-09 15:31:23 +02:00
parent 6f6eb85760
commit b6cb13583b
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/tls.scm
View File

@ -203,7 +203,8 @@ required structures.")
#:parallel-tests? #f #:parallel-tests? #f
#:test-target "test" #:test-target "test"
#:phases #:phases
(alist-replace (modify-phases %standard-phases
(replace
'configure 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -212,14 +213,15 @@ required structures.")
"shared" ;build shared libraries "shared" ;build shared libraries
"--libdir=lib" "--libdir=lib"
(string-append "--prefix=" out) (string-append "--prefix=" out)
;; XXX FIXME: Work around a code generation bug in GCC ;; XXX FIXME: Work around a code generation bug in GCC
;; 4.9.3 on ARM when compiled with -mfpu=neon. See: ;; 4.9.3 on ARM when compiled with -mfpu=neon. See:
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66917> ;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66917>
,@(if (and (not (%current-target-system)) ,@(if (and (not (%current-target-system))
(string-prefix? "armhf" (%current-system))) (string-prefix? "armhf" (%current-system)))
'("-mfpu=vfpv3") '("-mfpu=vfpv3")
'()))))) '()))))))
(alist-cons-before (add-before
'patch-source-shebangs 'patch-tests 'patch-source-shebangs 'patch-tests
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
(let ((bash (assoc-ref (or native-inputs inputs) "bash"))) (let ((bash (assoc-ref (or native-inputs inputs) "bash")))
@ -227,8 +229,7 @@ required structures.")
(("/bin/sh") (("/bin/sh")
(string-append bash "/bin/bash")) (string-append bash "/bin/bash"))
(("/bin/rm") (("/bin/rm")
"rm")))) "rm"))))))))
%standard-phases))))
(native-search-paths (native-search-paths
;; FIXME: These two variables must designate a single file or directory ;; FIXME: These two variables must designate a single file or directory
;; and are not actually "search paths." In practice it works OK in user ;; and are not actually "search paths." In practice it works OK in user