203/207: gnu: glibc-mesboot: Drop obsolete sun rpc support.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 8122897533f26a3bb81ef7fd07de189054d019f4
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sat Sep 8 08:57:42 2018 +0200

    gnu: glibc-mesboot: Drop obsolete sun rpc support.
    
    Most of sunrpc was already removed, this fixes building gettext-boot0
    
        gettext-boot0: netdb.h: fatal error: rpc/netdb.h: No such file or 
directory
    
    * gnu/packages/commencement.scm (glibc-headers-mesboot): Drop obsolete sun 
rpc
    support.
    * gnu/packages/patches/glibc-boot-2.16.0.patch: Drop obsolete sun rpc 
support.
---
 gnu/packages/commencement.scm                | 10 ++--
 gnu/packages/patches/glibc-boot-2.16.0.patch | 88 +++++++++++++++++++++++++++-
 2 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 8a757f1..499f055 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1340,9 +1340,11 @@ exec " gcc "/bin/" program
                     (headers (assoc-ref %build-inputs "headers")))
                 (list
                  (string-append "--prefix=" out)
+                 ;; Build RPC support.  It seems we either need rpc/*.h,
+                 ;; or should patch
+                 ;; include/netdb.h:32:24: fatal error: rpc/netdb.h: No such 
file or directory
+                 ;; "--enable-sanity-checks"
                  "--disable-obsolete-rpc"
-                 "--disable-sanity-checks"
-                 "--build=i686-unknown-linux-gnu"
                  "--host=i686-unknown-linux-gnu"
                  (string-append "--with-headers=" headers "/include")
                  "--enable-static-nss"
@@ -1402,8 +1404,8 @@ exec " gcc "/bin/" program
                     (invoke "make" (string-append (getcwd) "/sysd-sorted" )
                             (string-append "SHELL=" (getenv "CONFIG_SHELL")))
                     (substitute* "sysd-sorted"
-                      ((" sunrpc ") " ")
-                      ((" nis ") " "))
+                      ((" sunrpc") " ")
+                      ((" nis") " "))
                     ;; 'rpcgen' needs native libc headers to be built.
                     ;; (let ((libc (assoc-ref %build-inputs "libc")))
                     ;;   (substitute* "../sunrpc/Makefile"
diff --git a/gnu/packages/patches/glibc-boot-2.16.0.patch 
b/gnu/packages/patches/glibc-boot-2.16.0.patch
index d49fe95..a121ab3 100644
--- a/gnu/packages/patches/glibc-boot-2.16.0.patch
+++ b/gnu/packages/patches/glibc-boot-2.16.0.patch
@@ -1,7 +1,7 @@
 diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/adiff 
glibc-2.16.0/adiff
 --- /home/janneke/src/glibc-2.16.0/adiff       1970-01-01 01:00:00.000000000 
+0100
-+++ glibc-2.16.0/adiff 2018-09-02 22:16:15.719533689 +0200
-@@ -0,0 +1,72 @@
++++ glibc-2.16.0/adiff 2018-09-08 09:07:38.603783657 +0200
+@@ -0,0 +1,98 @@
 +/gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install 
-c -m 644 rpcsvc/bootparam.h 
/gnu/store/jrsyg8lyidcc9jawx98725zyrmjdg1c9-glibc-headers-mesboot-2.16.0/include/rpcsvc/bootparam.h
 +make[2]: *** No rule to make target 
`/gnu/store/jrsyg8lyidcc9jawx98725zyrmjdg1c9-glibc-headers-mesboot-2.16.0/include/rpcsvc/bootparam_prot.h',
 needed by `install-headers-nosubdir'.  Stop.
 +make[2]: Leaving directory 
`/tmp/guix-build-glibc-headers-mesboot-2.16.0.drv-0/glibc-2.16.0/sunrpc'
@@ -74,6 +74,32 @@ diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/adiff glibc-2.16.0/
 +make[1]: *** [sunrpc/subdir_lib] Error 2
 +make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0'
 +make: *** [all] Error 2
++
++================================================================================
++
++gettext-boot0: netdb.h: fatal error: rpc/netdb.h: No such file or directory
++
++================================================================================
++
++/gnu/store/f1dmbr4qdwi0p6l901wpklwpjl4wl5y4-gcc-mesboot1-4.7.4/bin/gcc  -I 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/nptl/sysdeps/pthread/bits
 -D BOOTSTRAP_GLIBC=1 -L 
/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0 -L 
/gnu/store/a9z3r06d89ig6ldla4gz0zh91rj18rri-glibc-mesboot0-2.2.5/lib nsswitch.c 
-c -std=gnu99 -fgnu89-inline  -O2 -Wall -Winline -Wwrite-strings 
-fmerge-all-constants -frounding-math -g -Wstrict-prototypes   -Wa,-mtune=i686  
     -I../include -I/tmp/g [...]
++In file included from nsswitch.c:481:0:
++function.def: In function '__nss_lookup_function':
++function.def:67:1: error: '_nss_files_getrpcent_r' undeclared (first use in 
this function)
++function.def:67:1: note: each undeclared identifier is reported only once for 
each function it appears in
++function.def:67:1: error: '_nss_files_endrpcent' undeclared (first use in 
this function)
++function.def:67:1: error: '_nss_files_setrpcent' undeclared (first use in 
this function)
++function.def:68:1: error: '_nss_files_getrpcbyname_r' undeclared (first use 
in this function)
++function.def:69:1: error: '_nss_files_getrpcbynumber_r' undeclared (first use 
in this function)
++nsswitch.c:430:2: warning: label 'remove_from_tree' defined but not used 
[-Wunused-label]
++nsswitch.c: At top level:
++nsswitch.c:783:1: warning: 'nss_new_service' defined but not used 
[-Wunused-function]
++nsswitch.c:96:13: warning: 'is_nscd' defined but not used [-Wunused-variable]
++nsswitch.c:98:15: warning: 'nscd_init_cb' defined but not used 
[-Wunused-variable]
++make[2]: *** 
[/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/build/nss/nsswitch.o] 
Error 1
++make[2]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0/nss'
++make[1]: *** [nss/subdir_lib] Error 2
++make[1]: Leaving directory 
`/tmp/guix-build-glibc-mesboot-2.16.0.drv-0/glibc-2.16.0'
++make: *** [all] Error 2
 diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/csu/errno-loc.c 
glibc-2.16.0/csu/errno-loc.c
 --- /home/janneke/src/glibc-2.16.0/csu/errno-loc.c     2012-06-30 
21:12:34.000000000 +0200
 +++ glibc-2.16.0/csu/errno-loc.c       2018-09-02 10:13:18.622488059 +0200
@@ -332,6 +358,49 @@ diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/nscd/nscd_helper.c
    size_t datasize = mapped->datasize;
  
    ref_t trail = mapped->head->array[hash];
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nss/function.def 
glibc-2.16.0/nss/function.def
+--- /home/janneke/src/glibc-2.16.0/nss/function.def    2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/nss/function.def      2018-09-08 09:42:13.142050418 +0200
+@@ -63,11 +63,6 @@ DEFINE_ENT (files, pw)
+ DEFINE_GET (files, pwnam)
+ DEFINE_GET (files, pwuid)
+ 
+-/* rpc */
+-DEFINE_ENT (files, rpc)
+-DEFINE_GETBY (files, rpc, name)
+-DEFINE_GETBY (files, rpc, number)
+-
+ /* services */
+ DEFINE_ENT (files, serv)
+ DEFINE_GETBY (files, serv, name)
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nss/getent.c 
glibc-2.16.0/nss/getent.c
+--- /home/janneke/src/glibc-2.16.0/nss/getent.c        2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/nss/getent.c  2018-09-08 10:26:23.221823857 +0200
+@@ -700,6 +700,7 @@ protocols_keys (int number, char *key[])
+   return result;
+ }
+ 
++#if 0
+ /* Now is all for rpc */
+ static inline void
+ print_rpc (struct rpcent *rpc)
+@@ -745,6 +746,7 @@ rpc_keys (int number, char *key[])
+ 
+   return result;
+ }
++#endif //rpc
+ 
+ /* for services */
+ static void
+@@ -880,7 +882,7 @@ D(netgroup)
+ D(networks)
+ D(passwd)
+ D(protocols)
+-D(rpc)
++//D(rpc)
+ D(services)
+ D(shadow)
+ #undef D
 diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/resolv/gethnamaddr.c 
glibc-2.16.0/resolv/gethnamaddr.c
 --- /home/janneke/src/glibc-2.16.0/resolv/gethnamaddr.c        2012-06-30 
21:12:34.000000000 +0200
 +++ glibc-2.16.0/resolv/gethnamaddr.c  2018-09-02 22:16:41.691943346 +0200
@@ -343,6 +412,21 @@ diff '--exclude=*.orig' -purN 
/home/janneke/src/glibc-2.16.0/resolv/gethnamaddr.
  #define RESOLVSORT
  
  #ifndef LOG_AUTH
+diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/resolv/netdb.h 
glibc-2.16.0/resolv/netdb.h
+--- /home/janneke/src/glibc-2.16.0/resolv/netdb.h      2012-06-30 
21:12:34.000000000 +0200
++++ glibc-2.16.0/resolv/netdb.h        2018-09-08 08:49:30.537811219 +0200
+@@ -26,11 +26,6 @@
+ 
+ #include <netinet/in.h>
+ #include <stdint.h>
+-#ifdef __USE_MISC
+-/* This is necessary to make this include file properly replace the
+-   Sun version.  */
+-# include <rpc/netdb.h>
+-#endif
+ 
+ #ifdef __USE_GNU
+ # define __need_sigevent_t
 diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Rules 
glibc-2.16.0/Rules
 --- /home/janneke/src/glibc-2.16.0/Rules       2012-06-30 21:12:34.000000000 
+0200
 +++ glibc-2.16.0/Rules 2018-09-02 10:52:06.927362861 +0200