[src/trunk]: src/external/cddl/osnet Use native XDR for libnvpair in userland.

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a0f7a4ad21ff
branches:  trunk
changeset: 456972:a0f7a4ad21ff
user:      hannken <hannken%NetBSD.org@localhost>
date:      Tue Jun 04 08:45:17 2019 +0000

description:
Use native XDR for libnvpair in userland.

diffstat:

 external/cddl/osnet/dist/uts/common/rpc/xdr.h |  4 ++++
 external/cddl/osnet/lib/libnvpair/Makefile    |  9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 75133cf897f3 -r a0f7a4ad21ff external/cddl/osnet/dist/uts/common/rpc/xdr.h
--- a/external/cddl/osnet/dist/uts/common/rpc/xdr.h     Tue Jun 04 08:44:08 2019 +0000
+++ b/external/cddl/osnet/dist/uts/common/rpc/xdr.h     Tue Jun 04 08:45:17 2019 +0000
@@ -34,6 +34,7 @@
  *
  */
 
+#if defined(_KERNEL) || defined(_STANDALONE)
 #ifndef _RPC_XDR_H
 #define        _RPC_XDR_H
 
@@ -646,3 +647,6 @@
 #endif
 
 #endif /* !_RPC_XDR_H */
+#else /* defined(_KERNEL) || defined(_STANDALONE) */
+#include_next <rpc/xdr.h>
+#endif /* defined(_KERNEL) || defined(_STANDALONE) */
diff -r 75133cf897f3 -r a0f7a4ad21ff external/cddl/osnet/lib/libnvpair/Makefile
--- a/external/cddl/osnet/lib/libnvpair/Makefile        Tue Jun 04 08:44:08 2019 +0000
+++ b/external/cddl/osnet/lib/libnvpair/Makefile        Tue Jun 04 08:45:17 2019 +0000
@@ -1,15 +1,13 @@
-#      $NetBSD: Makefile,v 1.9 2018/05/28 21:05:09 chs Exp $
+#      $NetBSD: Makefile,v 1.10 2019/06/04 08:45:17 hannken Exp $
 
 .include <bsd.init.mk>
 
 .PATH:  ${.CURDIR}/../../dist/lib/libnvpair
 .PATH:  ${.CURDIR}/../../dist/common/nvpair
-.PATH:  ${.CURDIR}/../../dist/uts/common/rpc
 
 CPPFLAGS+=     -I${OSNETDIR}/sys \
                -I${OPENSOLARIS_USR_DISTDIR}/head \
-               -I${OPENSOLARIS_SYS_DISTDIR}/common \
-               -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+               -I${OPENSOLARIS_SYS_DISTDIR}/common
 
 CPPFLAGS+=     -Wall \
                -Wno-unknown-pragmas \
@@ -21,9 +19,6 @@
 LIB=   nvpair
 
 SRCS=  libnvpair.c nvpair_alloc_system.c nvpair_alloc_fixed.c nvpair.c fnvpair.c nvpair_json.c
-SRCS+= xdr.c
-SRCS+= xdr_array.c
-SRCS+= xdr_mem.c
 
 .include "../../Makefile.zfs"
 .include <bsd.lib.mk>