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

gnu: subversion: Use invoke. 

* gnu/packages/version-control.scm (subversion)[arguments]: Use invoke and
remove vestigial plumbing in the 'install-perl-bindings' phase.
master
Mark H Weaver 2018-03-23 03:49:44 -04:00
parent 2c48ed4e97
commit 6d0f261237
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1106,23 +1106,21 @@ following features:
(lambda* (#:key outputs #:allow-other-keys) (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"))) (let ((out (assoc-ref outputs "out")))
(and (zero? (system* "make" "swig-pl-lib")) (invoke "make" "swig-pl-lib")
;; FIXME: Test failures. ;; FIXME: Test failures.
;; (zero? (system* "make" "check-swig-pl")) ;; (invoke "make" "check-swig-pl")
(zero? (system* "make" "install-swig-pl-lib")) (invoke "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? (invoke "perl" "Makefile.PL"
(system* "perl" "Makefile.PL" "NO_PERLLOCAL=1"
"NO_PERLLOCAL=1" (string-append "PREFIX=" out))
(string-append "PREFIX=" out))) (invoke "make" "install"
(zero? (string-append "OTHERLDFLAGS="
(system* "make" "install" "-Wl,-rpath="
(string-append "OTHERLDFLAGS=" out "/lib")))))))))
"-Wl,-rpath="
out "/lib"))))))))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
;; For the Perl bindings. ;; For the Perl bindings.