From 6ae35fea74002811bef8badca0abce0a771b2e19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Aug 2018 15:45:58 +0200 Subject: gnu: cvs-fast-export: Update to 1.44. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (cvs-fast-export): Update to 1.44. [arguments]: Add ‘fix-setpython-PATH’ phase to do just that. Remove obsolete python3 work-around from ‘remove-optimizations’ phase. --- gnu/packages/version-control.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 97e64a7cbc..1410e0da19 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1262,27 +1262,32 @@ RCS, PRCS, and Aegis packages.") (define-public cvs-fast-export (package (name "cvs-fast-export") - (version "1.43") + (version "1.44") (source (origin (method url-fetch) (uri (string-append "http://www.catb.org/~esr/" name "/" name "-" version ".tar.gz")) (sha256 (base32 - "17xp5q4cxmd6z0ii1fdr4j1djb9mz1qv7hzr6fawdapjzahi65m3")))) + "1l7hlys4vw4zk4ikdjiig5vzgv5dv48mbm8bdqgvgkyyxb2j0dm0")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure) + (add-before 'check 'fix-setpython-PATH + (lambda _ + ;; The Makefile does try to add the current working directory to + ;; $PATH, but this fails for some reason in 1.44. Hack around it. + (substitute* "tests/Makefile" + (("setpython" command) + (string-append "./" command))) + #t)) (add-after 'unpack 'remove-optimizations (lambda _ ;; Don't optimize for a specific processor architecture. (substitute* "Makefile" (("CFLAGS \\+= -march=native") "")) - ;; This code runs with Python2 or Python3 - (substitute* "cvsreduce" - (("python3") "python")) #t))) #:parallel-build? #f ; parallel a2x commands fail spectacularly #:make-flags -- cgit 1.4.1