sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

inet: do not link against libc

Browse source 
This should make its printed errors show up again.

Change-Id: I6839a584dc2a544bae7973ded3ab1dacf04e4ec0
This commit is contained in:
David van Moolenbroek 2015-06-06 11:51:39 +00:00
parent dfc3261535
commit 44707c1900
6 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/lib/libc/gen/bswap64.c
View file

@ -15,10 +15,6 @@ __RCSID("$NetBSD: bswap64.c,v 1.3 2009/03/16 05:59:21 cegger Exp $");
#undef bswap64 #undef bswap64
#if defined(__minix) && defined(_STANDALONE)
#undef bswap32
#endif /* defined(__minix) && defined(_STANDALONE) */
uint64_t uint64_t
bswap64(uint64_t x) bswap64(uint64_t x)
{ {

4
common/lib/libc/hash/sha2/sha2.c
View file

@ -57,6 +57,10 @@ __RCSID("$NetBSD: sha2.c,v 1.24 2013/06/09 19:46:56 christos Exp $");
#include "namespace.h" #include "namespace.h"
#include <string.h> #include <string.h>
#if defined(__minix) && defined(_LIBMINC)
#include <stdint.h> /* for uintptr_t */
#endif /* defined(__minix) && defined(_LIBMINC) */
#endif #endif
#include <sys/types.h> #include <sys/types.h>

4
minix/lib/libminc/Makefile
View file

@ -108,7 +108,6 @@ CLEANFILES+= ${f:C/\.o/.bc/}
.endif # ${USE_BITCODE:Uno} == "yes" .endif # ${USE_BITCODE:Uno} == "yes"
.endfor .endfor
CPPFLAGS.bswap64.c+= -D_STANDALONE
CPPFLAGS.rb.c+= -D_LIBC CPPFLAGS.rb.c+= -D_LIBC
.for f in \ .for f in \
@ -123,7 +122,6 @@ CLEANFILES+= ${f:C/\.o/.bc/}
.endif # ${USE_BITCODE:Uno} == "yes" .endif # ${USE_BITCODE:Uno} == "yes"
.endfor .endfor
CPPFLAGS.sha2.c+= -D_STANDALONE
CPPFLAGS.sha2.c+= -I${NETBSDSRCDIR}/sys CPPFLAGS.sha2.c+= -I${NETBSDSRCDIR}/sys
.for f in \ .for f in \
@ -211,7 +209,7 @@ CPPFLAGS.tolower_.c+= -I${LIBCDIR}/locale
CPPFLAGS.toupper_.c+= -I${LIBCDIR}/locale CPPFLAGS.toupper_.c+= -I${LIBCDIR}/locale
.for f in \ .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/} ${f} ${f:C/\.o/.bc/}: ${LIBMINIXCDIR}/gen/${f:C/\.o/.c/}
OBJS+= ${f} OBJS+= ${f}
CLEANFILES+= ${f} CLEANFILES+= ${f}

2
minix/lib/libminc/arch/earm/Makefile.libc.inc
View file

@ -24,8 +24,6 @@ OBJS+= ${f}
CLEANFILES+= ${f} CLEANFILES+= ${f}
.endfor .endfor
CPPFLAGS.byte_swap_4.S+= -D_STANDALONE
.for f in \ .for f in \
__aeabi_idiv0.o __aeabi_ldiv0.o __aeabi_idiv0.o __aeabi_ldiv0.o
${f}: ${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.c/} ${f}: ${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.c/}

2
minix/lib/libminc/arch/i386/Makefile.libc.inc
View file

@ -28,8 +28,6 @@ CLEANFILES+= ${f:C/\.o/.bc/}
.endif # ${USE_BITCODE:Uno} == "yes" .endif # ${USE_BITCODE:Uno} == "yes"
.endfor .endfor
CPPFLAGS.byte_swap_4.S+= -D_STANDALONE
.for f in \ .for f in \
memchr.o memcmp.o memcpy.o memmove.o memset.o \ memchr.o memcmp.o memcpy.o memmove.o memset.o \
strcat.o strchr.o strcmp.o strcpy.o strlen.o \ strcat.o strchr.o strcmp.o strcpy.o strlen.o \

3
minix/net/inet/Makefile
View file

@ -19,9 +19,6 @@ NOCLANGERROR=yes
DPADD+= ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBCHARDRIVER} ${LIBSYS}
LDADD+= -lchardriver -lsys LDADD+= -lchardriver -lsys
DPADD+= ${LIBC}
LDADD+= -lc
CPPFLAGS+= -I${.CURDIR} -D'ARGS(a)=a' CPPFLAGS+= -I${.CURDIR} -D'ARGS(a)=a'
.include <minix.service.mk> .include <minix.service.mk>