gnu: libchop: Build against libtirpc and related tools.
* gnu/packages/backup.scm (libchop)[source]: Add 'modules' and 'snippet'. [arguments]: Add #:configure-flags; add 'set-libtirpc-include-path' phase. [native-inputs]: Add RPCSVC-PROTO. [inputs]: Add LIBTIRPC.
This commit is contained in:
parent
9acacb71c9
commit
23b3947897
1 changed files with 31 additions and 3 deletions
|
@ -59,6 +59,7 @@
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages mcrypt)
|
#:use-module (gnu packages mcrypt)
|
||||||
#:use-module (gnu packages nettle)
|
#:use-module (gnu packages nettle)
|
||||||
|
#:use-module (gnu packages onc-rpc)
|
||||||
#:use-module (gnu packages pcre)
|
#:use-module (gnu packages pcre)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
|
@ -470,10 +471,26 @@ rsnapshot uses hard links to deduplicate identical files.")
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"))
|
"0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"))
|
||||||
(patches (search-patches "diffutils-gets-undeclared.patch"))))
|
(patches (search-patches "diffutils-gets-undeclared.patch"))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
'(begin
|
||||||
|
;; Include all the libtirpc headers necessary to get the
|
||||||
|
;; definitions of 'u_int', etc.
|
||||||
|
(substitute* '("src/block-server.c"
|
||||||
|
"include/chop/block-server.h"
|
||||||
|
"utils/chop-block-server.c")
|
||||||
|
(("#include <rpc/(.*)\\.h>" _ header)
|
||||||
|
(string-append "#include <rpc/types.h>\n"
|
||||||
|
"#include <rpc/rpc.h>\n"
|
||||||
|
"#include <rpc/" header ".h>\n")))
|
||||||
|
#t))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases (modify-phases %standard-phases
|
'(;; Link against libtirpc.
|
||||||
|
#:configure-flags '("LDFLAGS=-ltirpc -Wl,--as-needed")
|
||||||
|
|
||||||
|
#:phases (modify-phases %standard-phases
|
||||||
(add-before 'configure 'adjust-configure-script
|
(add-before 'configure 'adjust-configure-script
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Mimic upstream commit
|
;; Mimic upstream commit
|
||||||
|
@ -483,6 +500,15 @@ rsnapshot uses hard links to deduplicate identical files.")
|
||||||
(string-append "GUILE=" middle
|
(string-append "GUILE=" middle
|
||||||
"--variable bindir`/guile")))
|
"--variable bindir`/guile")))
|
||||||
#t))
|
#t))
|
||||||
|
(add-before 'build 'set-libtirpc-include-path
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
;; Allow <rpc/rpc.h> & co. to be found.
|
||||||
|
(let ((libtirpc (assoc-ref inputs "libtirpc")))
|
||||||
|
(setenv "CPATH"
|
||||||
|
(string-append (getenv "CPATH")
|
||||||
|
":" libtirpc
|
||||||
|
"/include/tirpc"))
|
||||||
|
#t)))
|
||||||
(add-before 'check 'skip-test
|
(add-before 'check 'skip-test
|
||||||
(lambda _
|
(lambda _
|
||||||
;; XXX: This test fails (1) because current GnuTLS no
|
;; XXX: This test fails (1) because current GnuTLS no
|
||||||
|
@ -493,10 +519,12 @@ rsnapshot uses hard links to deduplicate identical files.")
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("guile" ,guile-2.0)
|
`(("guile" ,guile-2.0)
|
||||||
("gperf" ,gperf-3.0) ;see <https://bugs.gnu.org/32382>
|
("gperf" ,gperf-3.0) ;see <https://bugs.gnu.org/32382>
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)
|
||||||
|
("rpcsvc-proto" ,rpcsvc-proto))) ;for 'rpcgen'
|
||||||
(inputs
|
(inputs
|
||||||
`(("guile" ,guile-2.0)
|
`(("guile" ,guile-2.0)
|
||||||
("util-linux" ,util-linux)
|
("util-linux" ,util-linux)
|
||||||
|
("libtirpc" ,libtirpc)
|
||||||
("gnutls" ,gnutls)
|
("gnutls" ,gnutls)
|
||||||
("tdb" ,tdb)
|
("tdb" ,tdb)
|
||||||
("bdb" ,bdb)
|
("bdb" ,bdb)
|
||||||
|
|
Reference in a new issue