ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: subversion: Use 'modify-phases'.

Browse source 
* gnu/packages/version-control.scm (subversion)[arguments]: Use
'modify-phases'.
This commit is contained in:
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

65
gnu/packages/version-control.scm
View file

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