inet: do not link against libc

This should make its printed errors show up again.

Change-Id: I6839a584dc2a544bae7973ded3ab1dacf04e4ec0

diff --git a/common/lib/libc/gen/bswap64.c b/common/lib/libc/gen/bswap64.c
index dfb32151092a1a764b88f80b5306431f8fdda821..b2decf94de768ff6087722441a3554b950fb4899 100644 (file)
--- a/common/lib/libc/gen/bswap64.c
+++ b/common/lib/libc/gen/bswap64.c
@@ -15,10 +15,6 @@ __RCSID("$NetBSD: bswap64.c,v 1.3 2009/03/16 05:59:21 cegger Exp $");
 
 #undef bswap64
 
-#if defined(__minix) && defined(_STANDALONE)
-#undef bswap32
-#endif /* defined(__minix) && defined(_STANDALONE) */
-
 uint64_t
 bswap64(uint64_t x)
 {

diff --git a/common/lib/libc/hash/sha2/sha2.c b/common/lib/libc/hash/sha2/sha2.c
index 27ace13bcbaa967c1d8846add9a20e9f4531dda6..54fd84e32eebeef89a7d5fc2b9becf33b8f6468a 100644 (file)
--- a/common/lib/libc/hash/sha2/sha2.c
+++ b/common/lib/libc/hash/sha2/sha2.c
@@ -57,6 +57,10 @@ __RCSID("$NetBSD: sha2.c,v 1.24 2013/06/09 19:46:56 christos Exp $");
 #include "namespace.h"
 #include <string.h>
 
+#if defined(__minix) && defined(_LIBMINC)
+#include <stdint.h> /* for uintptr_t */
+#endif /* defined(__minix) && defined(_LIBMINC) */
+
 #endif
 
 #include <sys/types.h>

diff --git a/minix/lib/libminc/Makefile b/minix/lib/libminc/Makefile
index 3432de78b530a0902657ba725206b2bfe236a940..db8b093f4960ff483505707da868a057ff08e899 100644 (file)
--- a/minix/lib/libminc/Makefile
+++ b/minix/lib/libminc/Makefile
@@ -108,7 +108,6 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .endif # ${USE_BITCODE:Uno} == "yes"
 .endfor
 
-CPPFLAGS.bswap64.c+=   -D_STANDALONE
 CPPFLAGS.rb.c+=                -D_LIBC
 
 .for f in \
@@ -123,7 +122,6 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .endif # ${USE_BITCODE:Uno} == "yes"
 .endfor
 
-CPPFLAGS.sha2.c+=      -D_STANDALONE
 CPPFLAGS.sha2.c+=      -I${NETBSDSRCDIR}/sys
 
 .for f in \
@@ -211,7 +209,7 @@ CPPFLAGS.tolower_.c+= -I${LIBCDIR}/locale
 CPPFLAGS.toupper_.c+= -I${LIBCDIR}/locale
 
 .for f in \
-       waitpid.o read_tsc_64.o fslib.o itoa.o
+       waitpid.o read_tsc_64.o fslib.o itoa.o oneC_sum.o
 ${f} ${f:C/\.o/.bc/}:  ${LIBMINIXCDIR}/gen/${f:C/\.o/.c/}
 OBJS+= ${f}
 CLEANFILES+= ${f}

diff --git a/minix/lib/libminc/arch/earm/Makefile.libc.inc b/minix/lib/libminc/arch/earm/Makefile.libc.inc
index 5295a0cc3f34bca6a72613c7cfcfa06c7f0cfce3..c104423adeecbba848bc7129a4c8bf04f4eeef03 100644 (file)
--- a/minix/lib/libminc/arch/earm/Makefile.libc.inc
+++ b/minix/lib/libminc/arch/earm/Makefile.libc.inc
@@ -24,8 +24,6 @@ OBJS+=        ${f}
 CLEANFILES+= ${f}
 .endfor
 
-CPPFLAGS.byte_swap_4.S+= -D_STANDALONE
-
 .for f in \
        __aeabi_idiv0.o __aeabi_ldiv0.o
 ${f}:  ${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.c/}

diff --git a/minix/lib/libminc/arch/i386/Makefile.libc.inc b/minix/lib/libminc/arch/i386/Makefile.libc.inc
index e7319f9b38e24dcf5e6baca7923679e617ed4148..3fc3868b65a717e7c443ed1b656592a5358872ab 100644 (file)
--- a/minix/lib/libminc/arch/i386/Makefile.libc.inc
+++ b/minix/lib/libminc/arch/i386/Makefile.libc.inc
@@ -28,8 +28,6 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .endif # ${USE_BITCODE:Uno} == "yes"
 .endfor
 
-CPPFLAGS.byte_swap_4.S+= -D_STANDALONE
-
 .for f in \
        memchr.o memcmp.o memcpy.o memmove.o memset.o \
        strcat.o strchr.o strcmp.o strcpy.o strlen.o \

diff --git a/minix/net/inet/Makefile b/minix/net/inet/Makefile
index ebc727efc9f89e51a9904759845d555e29e87316..839b0f980589ad1c589227f70ad90a723eefe2ec 100644 (file)
--- a/minix/net/inet/Makefile
+++ b/minix/net/inet/Makefile
@@ -19,9 +19,6 @@ NOCLANGERROR=yes
 DPADD+=        ${LIBCHARDRIVER} ${LIBSYS}
 LDADD+=        -lchardriver -lsys
 
-DPADD+= ${LIBC}
-LDADD+= -lc
-
 CPPFLAGS+=  -I${.CURDIR} -D'ARGS(a)=a'
 
 .include <minix.service.mk>