From: David van Moolenbroek <david@minix3.org>
Date: Thu, 8 Mar 2012 23:49:46 +0000 (+0100)
Subject: libminc-related updates
X-Git-Tag: v3.2.1~665
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=e8d2d2f6b6844c5d15bf66292555bcb16002dc26;p=minix.git

libminc-related updates
- add files needed for acpi, ahci, fbd, vfs to libminc
- remove "-lc" from their respective makefiles
- remove setenv from libminc (requires initialization)
---

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 9f8a7e431..912265e34 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -134,7 +134,7 @@ ACPICA_SRCS= \
 SRCS+=${ACPICA_SRCS} 
 
 DPADD+=	${LIBSYS}
-LDADD+=	-lsys -lc
+LDADD+=	-lsys
 
 CPPFLAGS += -I${.CURDIR}/include
 CFLAGS += -DACPI_LIBRARY
diff --git a/drivers/ahci/Makefile b/drivers/ahci/Makefile
index d3d9cd867..058962dd7 100644
--- a/drivers/ahci/Makefile
+++ b/drivers/ahci/Makefile
@@ -5,8 +5,6 @@ SRCS=	ahci.c
 DPADD+=	${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBMTHREAD}
 LDADD+=	-lblockdriver -lsys -ltimers -lmthread
 
-LDADD+=	-lc
-
 MAN=
 
 BINDIR?= /sbin
diff --git a/drivers/fbd/Makefile b/drivers/fbd/Makefile
index bd8715cfb..a4bfcc320 100644
--- a/drivers/fbd/Makefile
+++ b/drivers/fbd/Makefile
@@ -6,7 +6,7 @@ PROG=	fbd
 SRCS=	fbd.c rule.c action.c
 
 DPADD+=	${LIBBLOCKDRIVER} ${LIBSYS}
-LDADD+=	-lblockdriver -lsys -lc
+LDADD+=	-lblockdriver -lsys
 CPPFLAGS+=	-DDEBUG=0
 
 # The FBD driver requires NetBSD libc.
diff --git a/lib/libminc/Makefile b/lib/libminc/Makefile
index c4d26001e..2f2cf43fe 100644
--- a/lib/libminc/Makefile
+++ b/lib/libminc/Makefile
@@ -59,14 +59,15 @@ CPPFLAGS.fputs.c+= -I${LIBCSRCDIR}/include
 #
 
 # Import from stdio
-.for i in sprintf.c fprintf.c perror.c vsnprintf.c snprintf.c
+.for i in sprintf.c fprintf.c perror.c vsnprintf.c snprintf.c \
+	_rand48.c lrand48.c srand48.c
 .PATH.c: ${LIBCSRCDIR}/stdio
 CPPFLAGS.${i}= -I${LIBCSRCDIR}/stdio -I${LIBCSRCDIR}/include
 SRCS+=	${i}
 .endfor
 # Import from stdlib
 .for i in abort.c atexit.c atoi.c exit.c getenv.c \
-	getopt.c ldiv.c setenv.c
+	getopt.c ldiv.c
 .PATH.c: ${LIBCSRCDIR}/stdlib
 SRCS+= ${i}
 CPPFLAGS.${i}+= -I${LIBCSRCDIR}/stdlib -I${LIBCSRCDIR}/include 
@@ -79,7 +80,7 @@ errlist.c: ${LIBCSRCDIR}/gen/errlist.awk \
 
 .for i in assert.c _errno.c errno.c _env.c errlist.c \
 	execle.c getprogname.c sleep.c time.c \
-	ctype_.c isctype.c tolower_.c toupper_.c \
+	ctype_.c isctype.c tolower_.c toupper_.c usleep.c \
 	infinityf_ieee754.c infinity_ieee754.c \
 	fpclassifyf_ieee754.c fpclassifyd_ieee754.c \
 	isinff_ieee754.c isinfd_ieee754.c \
@@ -126,10 +127,10 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include -I${LIBCSRCDIR}/locale
 # Import from sys-minix
 .for i in access.c brk.c close.c environ.c execve.c fork.c \
 	getgid.c getpid.c getuid.c gettimeofday.c loadname.c \
-	link.c mknod.c mmap.c nanosleep.c open.c read.c sbrk.c \
-	select.c setuid.c stat.c stime.c syscall.c umask.c \
-	unlink.c waitpid.c \
-	brksize.S _ipc.S _senda.S
+	link.c _mcontext.c mknod.c mmap.c nanosleep.c open.c \
+	read.c sbrk.c select.c setuid.c sigprocmask.c stat.c \
+	stime.c syscall.c _ucontext.c umask.c unlink.c waitpid.c \
+	brksize.S _ipc.S _senda.S ucontext.S
 .PATH.c: ${LIBCSRCDIR}/sys-minix
 .PATH.S: ${LIBCSRCDIR}/arch/${MACHINE}/sys-minix
 SRCS+= ${i}
diff --git a/servers/vfs/Makefile b/servers/vfs/Makefile
index e94608c5c..1abbfb7b1 100644
--- a/servers/vfs/Makefile
+++ b/servers/vfs/Makefile
@@ -17,8 +17,6 @@ CPPFLAGS+= -DUSE_COVERAGE
 DPADD+=	${LIBSYS} ${LIBTIMERS} ${LIBEXEC}
 LDADD+=	-lsys -ltimers -lexec -lmthread
 
-LDADD+=	-lc
-
 MAN=
 
 BINDIR?= /usr/sbin