me
/
guix
Archived
1
0
Fork 0
Code

gnu: subversion: Use 'modify-phases'. 

* gnu/packages/version-control.scm (subversion)[arguments]: Use
'modify-phases'.
master
Efraim Flashner 2016-07-22 15:52:35 +03:00
parent ce84c924ac
commit 7c5a145414
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnu/packages/version-control.scm
View File

@ -692,23 +692,21 @@ property manipulation.")
"0imkxn25n6sbcgfldrx4z29npjprb1lxjm5fb89q4297161nx3zi"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
'configure 'patch-libtool-wrapper-ls
'(#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-libtool-wrapper-ls
(lambda* (#:key inputs #:allow-other-keys)
;; This substitution allows tests svnauthz_tests and
;; svnlook_tests to pass. These tests execute svnauthz and
;; svnlook through their libtool wrapper scripts from svn
;; hooks, whose empty environments cause "ls: command not
;; found" errors. It would be nice if this fix ultimately
;; made its way into libtool.
;; This substitution allows tests svnauthz_tests and svnlook_tests
;; to pass. These tests execute svnauthz and svnlook through
;; their libtool wrapper scripts from svn hooks, whose empty
;; environments cause "ls: command not found" errors. It would be
;; nice if this fix ultimately made its way into libtool.
(let ((coreutils (assoc-ref inputs "coreutils")))
(substitute* "libtool"
(("\\\\`ls") (string-append "\\`" coreutils "/bin/ls")))))
(alist-cons-after
'install 'install-perl-bindings
(("\\\\`ls") (string-append "\\`" coreutils "/bin/ls"))))))
(add-after 'install 'install-perl-bindings
(lambda* (#:key outputs #:allow-other-keys)
;; Follow the instructions from
;; 'subversion/bindings/swig/INSTALL'.
;; Follow the instructions from 'subversion/bindings/swig/INSTALL'.
(let ((out (assoc-ref outputs "out")))
(and (zero? (system* "make" "swig-pl-lib"))
;; FIXME: Test failures.
@ -725,8 +723,7 @@ property manipulation.")
(system* "make" "install"
(string-append "OTHERLDFLAGS="
"-Wl,-rpath="
out "/lib"))))))))
%standard-phases))))
out "/lib"))))))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
;; For the Perl bindings.