[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/42: gnu: hurd: Add NFS support.
From: |
guix-commits |
Subject: |
15/42: gnu: hurd: Add NFS support. |
Date: |
Sat, 25 Apr 2020 13:45:03 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit c2bd39925f6cd675683a08352fa1dce16241bebd
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Sun Apr 12 23:06:30 2020 +0200
gnu: hurd: Add NFS support.
* gnu/packages/hurd.scm (hurd)[inputs]: Add libtirpc/hurd.
[arguments]: Add configure flags to use libtirpc; add phase "find-tirpc" to
find the RPC headers; add phase "fix-rpc-headers" to include missing
headers.
---
gnu/packages/hurd.scm | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 8ff5c74..dd75879 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -44,6 +44,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages texinfo)
+ #:use-module (gnu packages onc-rpc)
#:use-module (gnu packages xorg) ; libpciaccess
#:use-module (guix git-download)
#:export (hurd-system?
@@ -393,6 +394,30 @@ boot, since this cannot be done from GNU/Linux."
(string-append dde "/" dir ) dir))
'("libmachdev" "libmachdevdde" "libddekit")))
#t))
+ (add-after 'unpack 'find-tirpc
+ (lambda* (#:key inputs #:allow-other-keys)
+ (for-each (lambda (var)
+ (setenv var
+ (string-append (assoc-ref inputs "libtirpc")
+ "/include/tirpc:"
+ (or (getenv var) ""))))
+ '("CROSS_C_INCLUDE_PATH" "C_INCLUDE_PATH"
+ "CROSS_CPATH" "CPATH"))
+ #t))
+ (add-after 'unpack 'fix-rpc-headers
+ (lambda _
+ (substitute* "nfs/mount.c"
+ (("#undef (TRUE|FALSE)") "")
+ (("#include <rpc/pmap_prot.h>" m)
+ (string-append "#include <rpc/xdr.h>\n" m)))
+ (substitute* '("nfsd/cache.c")
+ (("#undef (TRUE|FALSE)") ""))
+ (substitute* '("nfsd/loop.c"
+ "nfsd/main.c"
+ "nfsd/ops.c")
+ (("#include <rpc/pmap_prot.h>" m)
+ (string-append "#include <rpc/types.h>\n#include
<rpc/xdr.h>\n" m)))
+ #t))
(add-before 'build 'pre-build
(lambda _
;; Don't change the ownership of any file at this time.
@@ -496,7 +521,11 @@ fsysopts / --writable\n"))
"--disable-ncursesw"
"--without-libbz2"
"--without-libz"
- "--without-parted")))
+ "--without-parted"
+ ;; This is needed to pass the configure check for
+ ;; clnt_create
+ "ac_func_search_save_LIBS=-ltirpc"
+ "ac_cv_search_clnt_create=false")))
(build-system gnu-build-system)
(inputs
`(("glibc-hurd-headers" ,glibc/hurd-headers)
@@ -507,6 +536,9 @@ fsysopts / --writable\n"))
("unifont" ,unifont)
("libpciaccess" ,libpciaccess)
+ ;; For NFS support
+ ("libtirpc" ,libtirpc/hurd)
+
;; Tools for the /libexec/* scripts.
("bash-minimal" ,bash-minimal)
("coreutils" ,coreutils)
- 06/42: gnu: guix: Use gnutls-3.6.13 when cross-compiling., (continued)
- 06/42: gnu: guix: Use gnutls-3.6.13 when cross-compiling., guix-commits, 2020/04/25
- 05/42: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/25
- 08/42: gnu: guix: Update to eeb87326d8., guix-commits, 2020/04/25
- 04/42: gnu: guix: Cross-build workaround: Run native guile for version., guix-commits, 2020/04/25
- 09/42: vm: Make the device node procedure a parameter., guix-commits, 2020/04/25
- 13/42: gnu: Add dde-sources., guix-commits, 2020/04/25
- 10/42: gnu: hurd: Build DDE libraries., guix-commits, 2020/04/25
- 14/42: gnu: Add netdde., guix-commits, 2020/04/25
- 17/42: system: hurd: Add less, which to %base-packages/hurd., guix-commits, 2020/04/25
- 18/42: system: hurd: Add /etc/group., guix-commits, 2020/04/25
- 15/42: gnu: hurd: Add NFS support.,
guix-commits <=
- 21/42: services: Add hurd-ttys-service-type., guix-commits, 2020/04/25
- 24/42: services: hurd: Add dummy syslog., guix-commits, 2020/04/25
- 11/42: gnu: hurd: Fix references to /bin/w., guix-commits, 2020/04/25
- 12/42: gnu: hurd: Use default Qemu guest ip: 10.0.2.15., guix-commits, 2020/04/25
- 20/42: services: Add hurd-console-service-type., guix-commits, 2020/04/25
- 26/42: services: Add openssh-service as a Hurd service., guix-commits, 2020/04/25
- 22/42: services: Add hurd-user-services-service-type., guix-commits, 2020/04/25
- 23/42: services: Add guix-daemon-service as a Hurd service., guix-commits, 2020/04/25
- 29/42: system: hurd: Add openssh service., guix-commits, 2020/04/25
- 30/42: system: hurd: Create system profile for guix development., guix-commits, 2020/04/25