me
/
guix
Archived
1
0
Fork 0
Code

gnu: subversion: Use gexps and remove input labels. 

* gnu/packages/version-control.scm (subversion) [source]: Fix indentation.
[arguments]: Use gexps.  Strip trailing #t.  Use search-input-file in
patch-libtool-wrapper-ls phase.
[inputs]: Remove labels and sort.
master
Maxim Cournoyer 2023-03-23 23:41:07 -04:00
parent 54ee868cbe
commit 56a6fb5f66
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 56 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net> ;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org> ;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
@ -2011,72 +2011,66 @@ following features:
(name "subversion") (name "subversion")
(version "1.14.2") (version "1.14.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://apache/subversion/" (uri (string-append "mirror://apache/subversion/"
"subversion-" version ".tar.bz2")) "subversion-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0a6csc84hfymm8b5cnvq1n1p3rjjf33qy0z7y1k8lwkm1f6hw4y9")))) "0a6csc84hfymm8b5cnvq1n1p3rjjf33qy0z7y1k8lwkm1f6hw4y9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--enable-static=no") (list
#:phases #:configure-flags #~(list "--enable-static=no")
(modify-phases %standard-phases #:phases
(add-after 'configure 'patch-libtool-wrapper-ls #~(modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'configure 'patch-libtool-wrapper-ls
;; This substitution allows tests svnauthz_tests and svnlook_tests (lambda* (#:key inputs #:allow-other-keys)
;; to pass. These tests execute svnauthz and svnlook through ;; This substitution allows tests svnauthz_tests and svnlook_tests
;; their libtool wrapper scripts from svn hooks, whose empty ;; to pass. These tests execute svnauthz and svnlook through
;; environments cause "ls: command not found" errors. It would be ;; their libtool wrapper scripts from svn hooks, whose empty
;; nice if this fix ultimately made its way into libtool. ;; environments cause "ls: command not found" errors. It would be
(let ((coreutils (assoc-ref inputs "coreutils"))) ;; nice if this fix ultimately made its way into libtool.
(substitute* "libtool" (substitute* "libtool"
(("\\\\`ls") (string-append "\\`" coreutils "/bin/ls"))) (("\\\\`ls")
#t))) (string-append "\\`" (search-input-file inputs "bin/ls"))))))
(add-before 'build 'patch-test-sh (add-before 'build 'patch-test-sh
(lambda _ (lambda _
(substitute* "subversion/tests/libsvn_repos/repos-test.c" (substitute* "subversion/tests/libsvn_repos/repos-test.c"
(("#!/bin/sh") (string-append "#!" (which "sh")))) (("#!/bin/sh") (string-append "#!" (which "sh"))))))
#t)) (add-before 'check 'set-PARALLEL
(add-before 'check 'set-PARALLEL (lambda* (#:key parallel-tests? #:allow-other-keys)
(lambda* (#:key parallel-tests? #:allow-other-keys) (if parallel-tests?
(if parallel-tests? (setenv "PARALLEL" (number->string (parallel-job-count)))
(setenv "PARALLEL" (number->string (parallel-job-count))) (simple-format #t "parallel-tests? are disabled\n"))))
(simple-format #t "parallel-tests? are disabled\n")) (add-after 'install 'install-perl-bindings
#t)) (lambda _
(add-after 'install 'install-perl-bindings ;; Follow the instructions from 'subversion/bindings/swig/INSTALL'.
(lambda* (#:key outputs #:allow-other-keys) (invoke "make" "swig-pl-lib")
;; Follow the instructions from 'subversion/bindings/swig/INSTALL'. ;; FIXME: Test failures.
(let ((out (assoc-ref outputs "out"))) ;; (invoke "make" "check-swig-pl")
(invoke "make" "swig-pl-lib") (invoke "make" "install-swig-pl-lib")
;; FIXME: Test failures.
;; (invoke "make" "check-swig-pl")
(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" (invoke "perl" "Makefile.PL" "NO_PERLLOCAL=1"
(invoke "perl" "Makefile.PL" (string-append "PREFIX=" #$output))
"NO_PERLLOCAL=1" (invoke "make" "install"
(string-append "PREFIX=" out)) (string-append "OTHERLDFLAGS=-Wl,-rpath="
(invoke "make" "install" #$output "/lib"))))))))
(string-append "OTHERLDFLAGS="
"-Wl,-rpath="
out "/lib")))))))))
(native-inputs (native-inputs
(list pkg-config (list pkg-config
;; For the Perl bindings. ;; For the Perl bindings.
swig)) swig))
(inputs (inputs
`(("apr" ,apr) (list apr
("apr-util" ,apr-util) apr-util
("lz4" ,lz4) lz4
("serf" ,serf) perl
("perl" ,perl) python-wrapper
("python" ,python-wrapper) serf
("sqlite" ,sqlite) sqlite
("utf8proc" ,utf8proc) utf8proc
("zlib" ,zlib))) zlib))
(home-page "https://subversion.apache.org/") (home-page "https://subversion.apache.org/")
(synopsis "Revision control system") (synopsis "Revision control system")
(description (description