[Glibc-bsd-commits] r1445 - in trunk/glibc-2.3-head: sysdeps/kfreebsd sysdeps/kfreebsd/nfs upstream

[Robert Millan]

Author: rmh
Date: 2006-04-12 12:51:17 +0000 (Wed, 12 Apr 2006)
New Revision: 1445

Added:
   trunk/glibc-2.3-head/sysdeps/kfreebsd/nfs/nfs.h
Removed:
   trunk/glibc-2.3-head/upstream/no_nfs_h.patch
Modified:
   trunk/glibc-2.3-head/sysdeps/kfreebsd/Makefile
Log:
Add our own <nfs/nfs.h> (stub to <nfs/nfsproto.h>).

Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/Makefile
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/Makefile	2006-04-12 11:12:58 UTC (rev 1444)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/Makefile	2006-04-12 12:51:17 UTC (rev 1445)
@@ -110,7 +110,9 @@
 
 # Special ELF hacks.
 ifeq ($(subdir),elf)
-
 sysdep-rtld-routines += dl-brk dl-sbrk
+endif
 
+ifeq ($(subdir),sunrpc)
+sysdep_headers += nfs/nfs.h
 endif

Added: trunk/glibc-2.3-head/sysdeps/kfreebsd/nfs/nfs.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/nfs/nfs.h	2006-04-12 11:12:58 UTC (rev 1444)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/nfs/nfs.h	2006-04-12 12:51:17 UTC (rev 1445)
@@ -0,0 +1 @@
+#include <nfs/nfsproto.h>

Deleted: trunk/glibc-2.3-head/upstream/no_nfs_h.patch
===================================================================
--- trunk/glibc-2.3-head/upstream/no_nfs_h.patch	2006-04-12 11:12:58 UTC (rev 1444)
+++ trunk/glibc-2.3-head/upstream/no_nfs_h.patch	2006-04-12 12:51:17 UTC (rev 1445)
@@ -1,17 +0,0 @@
-
-Author: rmh
-Status: Fixed in CVS HEAD as of 20060117 (by adding sysdeps/generic/nfs/nfs.h)
-
---- sunrpc/rpcsvc/bootparam_prot.x~	1999-04-18 19:16:14.000000000 +0200
-+++ sunrpc/rpcsvc/bootparam_prot.x	2004-11-27 22:27:20.000000000 +0100
-@@ -44,8 +44,10 @@
- %#include <rpc/types.h>
- %#include <sys/time.h>
- %#include <sys/errno.h>
-+#ifdef __linux__
- %#include <nfs/nfs.h>
- #endif
-+#endif
- 
- const MAX_MACHINE_NAME  = 255;
- const MAX_PATH_LEN	= 1024;