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

gnu: apr-util: Use invoke. 

* gnu/packages/apr.scm (apr-util)[arguments]: Use invoke in the custom
configure phase.
This commit is contained in:
Mark H Weaver 2018-03-23 01:36:49 -04:00
parent ab6e5690af
commit 3d77ecfed4
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/apr.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -87,11 +87,10 @@ around or take advantage of platform-specific deficiencies or features.")
(apr (assoc-ref inputs "apr")) (apr (assoc-ref inputs "apr"))
(expat (assoc-ref inputs "expat"))) (expat (assoc-ref inputs "expat")))
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(zero? (invoke "./configure"
(system* "./configure" (string-append "--prefix=" out)
(string-append "--prefix=" out) (string-append "--with-apr=" apr)
(string-append "--with-apr=" apr) (string-append "--with-expat=" expat))))))
(string-append "--with-expat=" expat)))))))
;; There are race conditions during 'make check'. Typically, the ;; There are race conditions during 'make check'. Typically, the
;; 'testall' executable is not built yet by the time 'make check' tries ;; 'testall' executable is not built yet by the time 'make check' tries