[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/10: gnu: subversion: Fix libtool wrapper execution in hooks.
From: |
Eric Bavier |
Subject: |
01/10: gnu: subversion: Fix libtool wrapper execution in hooks. |
Date: |
Tue, 02 Dec 2014 14:43:55 +0000 |
bavier pushed a commit to branch master
in repository guix.
commit 7639105b1270dd8063c97e822276104595207211
Author: Eric Bavier <address@hidden>
Date: Mon Nov 17 21:22:16 2014 -0600
gnu: subversion: Fix libtool wrapper execution in hooks.
* gnu/packages/version-control.scm (subversion)[arguments]: New
'patch-libtool-wrapper-ls phase.
---
gnu/packages/version-control.scm | 52 +++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8ee624f..f5e9a27 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -427,33 +427,45 @@ property manipulation.")
(version "1.7.18")
(source (origin
(method url-fetch)
- (uri (string-append
"http://archive.apache.org/dist/subversion/subversion-"
- version ".tar.bz2"))
+ (uri (string-append "http://archive.apache.org/dist/subversion/"
+ "subversion-" version ".tar.bz2"))
(sha256
(base32
"06nrqnn3qq1hhskkcdbm0ilk2xv6ay2gyf2c7qvxp6xncb782wzn"))))
(build-system gnu-build-system)
(arguments
'(#:phases (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"))
+ '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.
+ (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.
- (with-directory-excursion
- "subversion/bindings/swig/perl/native"
- (and (zero?
- (system* "perl" "Makefile.PL"
- (string-append "PREFIX=" out)))
- (zero?
- (system* "make" "install")))))))
- %standard-phases)))
+ ;; Set the right installation prefix.
+ (with-directory-excursion
+ "subversion/bindings/swig/perl/native"
+ (and (zero?
+ (system* "perl" "Makefile.PL"
+ (string-append "PREFIX=" out)))
+ (zero?
+ (system* "make" "install")))))))
+ %standard-phases))))
(native-inputs
`(("pkg-config" ,pkg-config)
;; For the Perl bindings.
- branch master updated (de878f1 -> f4c4513), Eric Bavier, 2014/12/02
- 07/10: gnu: Add python-pycairo., Eric Bavier, 2014/12/02
- 05/10: gnu: Add python-distutils-extra., Eric Bavier, 2014/12/02
- 04/10: gnu: Add python-pillow., Eric Bavier, 2014/12/02
- 09/10: gnu: Add python2-pygtk., Eric Bavier, 2014/12/02
- 08/10: gnu: Add python-pygobject., Eric Bavier, 2014/12/02
- 01/10: gnu: subversion: Fix libtool wrapper execution in hooks.,
Eric Bavier <=
- 03/10: gnu: Add python-sqlalchemy., Eric Bavier, 2014/12/02
- 02/10: gnu: python: Add sqlite input., Eric Bavier, 2014/12/02
- 06/10: gnu: Add python-elib.intl., Eric Bavier, 2014/12/02
- 10/10: gnu: Add gourmet., Eric Bavier, 2014/12/02