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

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

@ -33,7 +33,7 @@
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; 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 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
@ -2019,9 +2019,10 @@ following features:
"0a6csc84hfymm8b5cnvq1n1p3rjjf33qy0z7y1k8lwkm1f6hw4y9"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-static=no")
(list
#:configure-flags #~(list "--enable-static=no")
#:phases
(modify-phases %standard-phases
#~(modify-phases %standard-phases
(add-after 'configure 'patch-libtool-wrapper-ls
(lambda* (#:key inputs #:allow-other-keys)
;; This substitution allows tests svnauthz_tests and svnlook_tests
@ -2029,54 +2030,47 @@ following features:
;; 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")))
#t)))
(("\\\\`ls")
(string-append "\\`" (search-input-file inputs "bin/ls"))))))
(add-before 'build 'patch-test-sh
(lambda _
(substitute* "subversion/tests/libsvn_repos/repos-test.c"
(("#!/bin/sh") (string-append "#!" (which "sh"))))
#t))
(("#!/bin/sh") (string-append "#!" (which "sh"))))))
(add-before 'check 'set-PARALLEL
(lambda* (#:key parallel-tests? #:allow-other-keys)
(if parallel-tests?
(setenv "PARALLEL" (number->string (parallel-job-count)))
(simple-format #t "parallel-tests? are disabled\n"))
#t))
(simple-format #t "parallel-tests? are disabled\n"))))
(add-after 'install 'install-perl-bindings
(lambda* (#:key outputs #:allow-other-keys)
(lambda _
;; Follow the instructions from 'subversion/bindings/swig/INSTALL'.
(let ((out (assoc-ref outputs "out")))
(invoke "make" "swig-pl-lib")
;; FIXME: Test failures.
;; (invoke "make" "check-swig-pl")
(invoke "make" "install-swig-pl-lib")
;; Set the right installation prefix.
(with-directory-excursion
"subversion/bindings/swig/perl/native"
(invoke "perl" "Makefile.PL"
"NO_PERLLOCAL=1"
(string-append "PREFIX=" out))
(with-directory-excursion "subversion/bindings/swig/perl/native"
(invoke "perl" "Makefile.PL" "NO_PERLLOCAL=1"
(string-append "PREFIX=" #$output))
(invoke "make" "install"
(string-append "OTHERLDFLAGS="
"-Wl,-rpath="
out "/lib")))))))))
(string-append "OTHERLDFLAGS=-Wl,-rpath="
#$output "/lib"))))))))
(native-inputs
(list pkg-config
;; For the Perl bindings.
swig))
(inputs
`(("apr" ,apr)
("apr-util" ,apr-util)
("lz4" ,lz4)
("serf" ,serf)
("perl" ,perl)
("python" ,python-wrapper)
("sqlite" ,sqlite)
("utf8proc" ,utf8proc)
("zlib" ,zlib)))
(list apr
apr-util
lz4
perl
python-wrapper
serf
sqlite
utf8proc
zlib))
(home-page "https://subversion.apache.org/")
(synopsis "Revision control system")
(description