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

gnu: apr-util: Use system expat library. 

* gnu/packages/apr.scm: Import (guix licenses) with prefix "l:".
  (apr)[license]: Adapt to license prefix.
  (apr-util)[propagated-inputs]: Add expat.
  [arguments]: Pass --with-expat to configure.
  [license]: Adapt to license prefix.
This commit is contained in:
Mark H Weaver 2015-05-07 04:43:01 -04:00
parent c716f5a0e0
commit 9f9d073be1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/apr.scm
View File

@ -18,12 +18,13 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages apr) (define-module (gnu packages apr)
#:use-module (guix licenses) #:use-module ((guix licenses) #:prefix l:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages xml)
#:use-module (gnu packages autotools)) #:use-module (gnu packages autotools))
(define-public apr (define-public apr
@ -59,7 +60,7 @@ an API to which software developers may code and be assured of predictable if
not identical behaviour regardless of the platform on which their software is not identical behaviour regardless of the platform on which their software is
built, relieving them of the need to code special-case conditions to work built, relieving them of the need to code special-case conditions to work
around or take advantage of platform-specific deficiencies or features.") around or take advantage of platform-specific deficiencies or features.")
(license asl2.0))) (license l:asl2.0)))
(define-public apr-util (define-public apr-util
(package (package
@ -75,18 +76,22 @@ around or take advantage of platform-specific deficiencies or features.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("apr" ,apr))) `(("apr" ,apr)))
(propagated-inputs
`(("expat" ,expat)))
(arguments (arguments
'(#:phases '(#:phases
(alist-replace (alist-replace
'configure 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(apr (assoc-ref inputs "apr"))) (apr (assoc-ref inputs "apr"))
(expat (assoc-ref inputs "expat")))
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(zero? (zero?
(system* "./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)))))
%standard-phases) %standard-phases)
;; There are race conditions during 'make check'. Typically, the ;; There are race conditions during 'make check'. Typically, the
@ -98,4 +103,4 @@ around or take advantage of platform-specific deficiencies or features.")
(synopsis "One of the Apache Portable Runtime Library companions") (synopsis "One of the Apache Portable Runtime Library companions")
(description (description
"APR-util provides a number of helpful abstractions on top of APR.") "APR-util provides a number of helpful abstractions on top of APR.")
(license asl2.0))) (license l:asl2.0)))