gnu: cvs-fast-export: Update to 1.44.

* 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.
This commit is contained in:
Tobias Geerinckx-Rice 2018-08-15 15:45:58 +02:00
parent a1c86d1db4
commit 6ae35fea74
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 10 additions and 5 deletions

View File

@ -1262,27 +1262,32 @@ RCS, PRCS, and Aegis packages.")
(define-public cvs-fast-export (define-public cvs-fast-export
(package (package
(name "cvs-fast-export") (name "cvs-fast-export")
(version "1.43") (version "1.44")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.catb.org/~esr/" (uri (string-append "http://www.catb.org/~esr/"
name "/" name "-" version ".tar.gz")) name "/" name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"17xp5q4cxmd6z0ii1fdr4j1djb9mz1qv7hzr6fawdapjzahi65m3")))) "1l7hlys4vw4zk4ikdjiig5vzgv5dv48mbm8bdqgvgkyyxb2j0dm0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (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 (add-after 'unpack 'remove-optimizations
(lambda _ (lambda _
;; Don't optimize for a specific processor architecture. ;; Don't optimize for a specific processor architecture.
(substitute* "Makefile" (substitute* "Makefile"
(("CFLAGS \\+= -march=native") "")) (("CFLAGS \\+= -march=native") ""))
;; This code runs with Python2 or Python3
(substitute* "cvsreduce"
(("python3") "python"))
#t))) #t)))
#:parallel-build? #f ; parallel a2x commands fail spectacularly #:parallel-build? #f ; parallel a2x commands fail spectacularly
#:make-flags #:make-flags