me/guix
Archived
1
0
Fork 0
Code Activity

gnu: subversion: Fix libtool wrapper execution in hooks.

Browse source 
* gnu/packages/version-control.scm (subversion)[arguments]: New
  'patch-libtool-wrapper-ls phase.
This commit is contained in:
Eric Bavier 2014-11-17 21:22:16 -06:00
parent de878f1b29
commit 7639105b12
1 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -427,33 +427,45 @@ property manipulation.")
(version "1.7.18") (version "1.7.18")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://archive.apache.org/dist/subversion/subversion-" (uri (string-append "http://archive.apache.org/dist/subversion/"
version ".tar.bz2")) "subversion-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"06nrqnn3qq1hhskkcdbm0ilk2xv6ay2gyf2c7qvxp6xncb782wzn")))) "06nrqnn3qq1hhskkcdbm0ilk2xv6ay2gyf2c7qvxp6xncb782wzn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases (alist-cons-after
'install 'instal-perl-bindings 'configure 'patch-libtool-wrapper-ls
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Follow the instructions from ;; This substitution allows tests svnauthz_tests and
;; 'subversion/bindings/swig/INSTALL'. ;; svnlook_tests to pass. These tests execute svnauthz and
(let ((out (assoc-ref outputs "out"))) ;; svnlook through their libtool wrapper scripts from svn
(and (zero? (system* "make" "swig-pl-lib")) ;; hooks, whose empty environments cause "ls: command not
;; FIXME: Test failures. ;; found" errors. It would be nice if this fix ultimately
;; (zero? (system* "make" "check-swig-pl")) ;; made its way into libtool.
(zero? (system* "make" "install-swig-pl-lib")) (let ((coreutils (assoc-ref inputs "coreutils")))
(substitute* "libtool"
(("\\\\`ls") (string-append "\\`" coreutils "/bin/ls")))))
(alist-cons-after
'install 'instal-perl-bindings
(lambda* (#:key outputs #:allow-other-keys)
;; Follow the instructions from
;; 'subversion/bindings/swig/INSTALL'.
(let ((out (assoc-ref outputs "out")))
(and (zero? (system* "make" "swig-pl-lib"))
;; FIXME: Test failures.
;; (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")))))))
%standard-phases))) %standard-phases))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
;; For the Perl bindings. ;; For the Perl bindings.