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

remove libcompat_minix as library

Browse source 
. get rid of includes in libcompat_minix:
	  . move configfile.h to minix/include/
	  . all others are unneeded as they point to other files
	. merge the .c files with libc

Change-Id: I5e840c66fb9bc484f377926aa9d66473bbd16259
This commit is contained in:
Ben Gras 2014-08-25 00:19:51 +02:00
parent d1abad940a
commit c2808d8b07
66 changed files with 64 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
distrib/sets/lists/minix/md.evbarm
View file

@ -40,7 +40,7 @@
./usr/include/arm/bswap.h minix-sys ./usr/include/arm/bswap.h minix-sys
./usr/include/arm/byte_swap.h minix-sys ./usr/include/arm/byte_swap.h minix-sys
./usr/include/arm/cdefs.h minix-sys ./usr/include/arm/cdefs.h minix-sys
./usr/include/arm/compat_jmp_buf.h minix-sys ./usr/include/arm/compat_jmp_buf.h minix-sys obsolete
./usr/include/arm/cpuconf.h minix-sys ./usr/include/arm/cpuconf.h minix-sys
./usr/include/arm/cpu.h minix-sys ./usr/include/arm/cpu.h minix-sys
./usr/include/arm/disklabel.h minix-sys ./usr/include/arm/disklabel.h minix-sys

2
distrib/sets/lists/minix/md.i386
View file

@ -69,7 +69,7 @@
./usr/include/i386/byte_swap.h minix-sys ./usr/include/i386/byte_swap.h minix-sys
./usr/include/i386/cdefs.h minix-sys ./usr/include/i386/cdefs.h minix-sys
./usr/include/i386/cmos.h minix-sys ./usr/include/i386/cmos.h minix-sys
./usr/include/i386/compat_jmp_buf.h minix-sys ./usr/include/i386/compat_jmp_buf.h minix-sys obsolete
./usr/include/i386/cpu.h minix-sys ./usr/include/i386/cpu.h minix-sys
./usr/include/i386/disklabel.h minix-sys ./usr/include/i386/disklabel.h minix-sys
./usr/include/i386/diskparm.h minix-sys ./usr/include/i386/diskparm.h minix-sys

22
distrib/sets/lists/minix/mi
View file

@ -1423,12 +1423,12 @@
./usr/include/net/gen/in.h minix-sys ./usr/include/net/gen/in.h minix-sys
./usr/include/net/gen/ip_hdr.h minix-sys ./usr/include/net/gen/ip_hdr.h minix-sys
./usr/include/net/gen/ip_io.h minix-sys ./usr/include/net/gen/ip_io.h minix-sys
./usr/include/net/gen/nameser.h minix-sys ./usr/include/net/gen/nameser.h minix-sys obsolete
./usr/include/net/gen/netdb.h minix-sys ./usr/include/net/gen/netdb.h minix-sys obsolete
./usr/include/net/gen/oneCsum.h minix-sys ./usr/include/net/gen/oneCsum.h minix-sys
./usr/include/net/gen/psip_hdr.h minix-sys ./usr/include/net/gen/psip_hdr.h minix-sys
./usr/include/net/gen/psip_io.h minix-sys ./usr/include/net/gen/psip_io.h minix-sys
./usr/include/net/gen/resolv.h minix-sys ./usr/include/net/gen/resolv.h minix-sys obsolete
./usr/include/net/gen/rip.h minix-sys ./usr/include/net/gen/rip.h minix-sys
./usr/include/net/gen/route.h minix-sys ./usr/include/net/gen/route.h minix-sys
./usr/include/net/gen/socket.h minix-sys ./usr/include/net/gen/socket.h minix-sys
@ -1635,7 +1635,7 @@
./usr/include/sys/ioctl.h minix-sys ./usr/include/sys/ioctl.h minix-sys
./usr/include/sys/iostat.h minix-sys ./usr/include/sys/iostat.h minix-sys
./usr/include/sys/ipc.h minix-sys ./usr/include/sys/ipc.h minix-sys
./usr/include/sys/jmp_buf.h minix-sys ./usr/include/sys/jmp_buf.h minix-sys obsolete
./usr/include/sys/joystick.h minix-sys ./usr/include/sys/joystick.h minix-sys
./usr/include/sys/kbdio.h minix-sys ./usr/include/sys/kbdio.h minix-sys
./usr/include/sys/kcore.h minix-sys ./usr/include/sys/kcore.h minix-sys
@ -1858,7 +1858,7 @@
./usr/lib/bc/libc.a minix-sys bitcode ./usr/lib/bc/libc.a minix-sys bitcode
./usr/lib/bc/libc++.a minix-sys bitcode ./usr/lib/bc/libc++.a minix-sys bitcode
./usr/lib/bc/libchardriver.a minix-sys bitcode ./usr/lib/bc/libchardriver.a minix-sys bitcode
./usr/lib/bc/libcompat_minix.a minix-sys bitcode ./usr/lib/bc/libcompat_minix.a minix-sys bitcode obsolete
./usr/lib/bc/libcrypt.a minix-sys bitcode ./usr/lib/bc/libcrypt.a minix-sys bitcode
./usr/lib/bc/libcurses.a minix-sys bitcode ./usr/lib/bc/libcurses.a minix-sys bitcode
./usr/lib/bc/libddekit.a minix-sys bitcode ./usr/lib/bc/libddekit.a minix-sys bitcode
@ -1914,7 +1914,7 @@
./usr/lib/cawf/me.mac minix-sys ./usr/lib/cawf/me.mac minix-sys
./usr/lib/cawf/mnx.mac minix-sys ./usr/lib/cawf/mnx.mac minix-sys
./usr/lib/cawf/ms.mac minix-sys ./usr/lib/cawf/ms.mac minix-sys
./usr/lib/compat_minix.pc minix-sys ./usr/lib/compat_minix.pc minix-sys obsolete
./usr/lib/crontab minix-sys ./usr/lib/crontab minix-sys
./usr/lib/crt0.o minix-sys ./usr/lib/crt0.o minix-sys
./usr/lib/crtbegin.o minix-sys ./usr/lib/crtbegin.o minix-sys
@ -1991,11 +1991,11 @@
./usr/lib/libc++.a minix-sys libcxx ./usr/lib/libc++.a minix-sys libcxx
./usr/lib/libchardriver.a minix-sys ./usr/lib/libchardriver.a minix-sys
./usr/lib/libchardriver_pic.a minix-sys ./usr/lib/libchardriver_pic.a minix-sys
./usr/lib/libcompat_minix.a minix-sys ./usr/lib/libcompat_minix.a minix-sys obsolete
./usr/lib/libcompat_minix_pic.a minix-sys ./usr/lib/libcompat_minix_pic.a minix-sys obsolete
./usr/lib/libcompat_minix.so.0.0 minix-sys ./usr/lib/libcompat_minix.so.0.0 minix-sys obsolete
./usr/lib/libcompat_minix.so.0 minix-sys ./usr/lib/libcompat_minix.so.0 minix-sys obsolete
./usr/lib/libcompat_minix.so minix-sys ./usr/lib/libcompat_minix.so minix-sys obsolete
./usr/lib/libc.pc minix-sys ./usr/lib/libc.pc minix-sys
./usr/lib/libc_pic.a minix-sys ./usr/lib/libc_pic.a minix-sys
./usr/lib/libc++_pic.a minix-sys libcxx ./usr/lib/libc++_pic.a minix-sys libcxx

1
lib/Makefile
View file

@ -39,7 +39,6 @@ SUBDIR+= ../minix/lib/libasyn \
../minix/lib/libbdev \ ../minix/lib/libbdev \
../minix/lib/libblockdriver \ ../minix/lib/libblockdriver \
../minix/lib/libchardriver \ ../minix/lib/libchardriver \
../minix/lib/libcompat_minix \
../minix/lib/libddekit \ ../minix/lib/libddekit \
../minix/lib/libdevman \ ../minix/lib/libdevman \
../minix/lib/libexec \ ../minix/lib/libexec \

2
lib/libc/pkgconfig/libc.pc
View file

@ -1,4 +1,4 @@
Name: c Name: c
Description: NetBSD C Library Description: NetBSD C Library
Version: 1.0 Version: 1.0
Libs: -lc -lminlib -lcompat_minix Libs: -lc -lminlib

2
minix/commands/Makefile.inc
View file

@ -1,7 +1,7 @@
# Only include Minix-specific libraries when compiling # Only include Minix-specific libraries when compiling
# for non-Minix, i.e. not natively in a crossbuild. # for non-Minix, i.e. not natively in a crossbuild.
.if !defined(HOSTPROGNAME) .if !defined(HOSTPROGNAME)
LDADD+= -lminlib -lcompat_minix -lasyn -lterminfo LDADD+= -lminlib -lasyn -lterminfo
.endif .endif
BINDIR?=/usr/bin BINDIR?=/usr/bin

2
minix/commands/add_route/add_route.c
View file

@ -15,7 +15,7 @@ Created August 7, 1991 by Philip Homburg
#include <net/hton.h> #include <net/hton.h>
#include <net/netlib.h> #include <net/netlib.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/route.h> #include <net/gen/route.h>

2
minix/commands/arp/arp.c
View file

@ -25,7 +25,7 @@ Manipulate ARP table
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/ip_io.h> #include <net/gen/ip_io.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/arp_io.h> #include <net/gen/arp_io.h>

2
minix/commands/dhcpd/dhcpd.c
View file

@ -18,7 +18,7 @@
#include <sys/asynchio.h> #include <sys/asynchio.h>
#include <net/hton.h> #include <net/hton.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/ether.h> #include <net/gen/ether.h>

2
minix/commands/dhcpd/tags.c
View file

@ -18,7 +18,7 @@
#include <sys/asynchio.h> #include <sys/asynchio.h>
#include <net/hton.h> #include <net/hton.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/ether.h> #include <net/gen/ether.h>

7
minix/commands/hostaddr/hostaddr.c
View file

@ -26,10 +26,11 @@ Created: Jan 27, 1992 by Philip Homburg
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/ip_io.h> #include <net/gen/ip_io.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/nameser.h>
#include <net/gen/resolv.h> #include <arpa/nameser.h>
#include <resolv.h>
#include <net/gen/dhcp.h> #include <net/gen/dhcp.h>
#include <minix/paths.h> #include <minix/paths.h>

2
minix/commands/irdpd/irdpd.c
View file

@ -27,7 +27,7 @@
#include <net/gen/icmp_hdr.h> #include <net/gen/icmp_hdr.h>
#include <net/gen/ip_io.h> #include <net/gen/ip_io.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/oneCsum.h> #include <net/gen/oneCsum.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/udp.h> #include <net/gen/udp.h>

6
minix/commands/nonamed/nonamed.c
View file

@ -32,9 +32,9 @@ static const char version[] = "2.7";
#include <net/netlib.h> #include <net/netlib.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/nameser.h> #include <arpa/nameser.h>
#include <net/gen/resolv.h> #include <resolv.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/tcp.h> #include <net/gen/tcp.h>
#include <net/gen/tcp_io.h> #include <net/gen/tcp_io.h>

2
minix/commands/pr_routes/pr_routes.c
View file

@ -19,7 +19,7 @@ vmd/cmd/simple/pr_routes.c
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/ip_io.h> #include <net/gen/ip_io.h>
#include <net/gen/route.h> #include <net/gen/route.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#define N_IF 64 /* More than enough? */ #define N_IF 64 /* More than enough? */

4
minix/commands/rarpd/rarpd.c
View file

@ -28,14 +28,14 @@ Changed: Dec 11, 2000 by Kees J. Bot
#include <sys/asynchio.h> #include <sys/asynchio.h>
#include <net/hton.h> #include <net/hton.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/ether.h> #include <net/gen/ether.h>
#include <net/gen/eth_io.h> #include <net/gen/eth_io.h>
#include <net/gen/if_ether.h> #include <net/gen/if_ether.h>
#include <net/gen/ip_io.h> #include <net/gen/ip_io.h>
#include <net/gen/nameser.h> #include <arpa/nameser.h>
#define MAX_RARP_RETRIES 5 #define MAX_RARP_RETRIES 5
#define RARP_TIMEOUT 5 #define RARP_TIMEOUT 5

2
minix/commands/rcp/rcp.c
View file

@ -41,7 +41,7 @@ static char sccsid[] = "@(#)rcp.c 1.1 87/12/21 SMI"; /* from UCB 5.3 6/8/85"*/
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/netlib.h> #include <net/netlib.h>
#if __STDC__ #if __STDC__

2
minix/commands/rget/rget.c
View file

@ -18,7 +18,7 @@
#if __minix #if __minix
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/tcp.h> #include <net/gen/tcp.h>
#include <net/gen/tcp_hdr.h> #include <net/gen/tcp_hdr.h>

2
minix/commands/rlogin/rlogin.c
View file

@ -59,7 +59,7 @@ static char sccsid[] = "@(#)rlogin.c 5.33 (Berkeley) 3/1/91";
#include <net/netlib.h> #include <net/netlib.h>
#include <net/hton.h> #include <net/hton.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/tcp.h> #include <net/gen/tcp.h>
#include <net/gen/tcp_io.h> #include <net/gen/tcp_io.h>

2
minix/commands/rsh/rsh.c
View file

@ -60,7 +60,7 @@ static char sccsid[] = "@(#)rsh.c 5.24 (Berkeley) 7/1/91";
#include <unistd.h> #include <unistd.h>
#include <net/netlib.h> #include <net/netlib.h>
#include <net/gen/netdb.h> #include <netdb.h>
int main( int argc, char *argv[] ); int main( int argc, char *argv[] );
void usage( void ); void usage( void );
char *copyargs( char **argv ); char *copyargs( char **argv );

2
minix/commands/rshd/rshd.c
View file

@ -30,7 +30,7 @@ in.rshd.c
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/tcp.h> #include <net/gen/tcp.h>
#include <net/gen/tcp_io.h> #include <net/gen/tcp_io.h>

2
minix/commands/swifi/socket.c
View file

@ -24,7 +24,7 @@ Open a TCP connection
#include <net/netlib.h> #include <net/netlib.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/tcp.h> #include <net/gen/tcp.h>
#include <net/gen/tcp_io.h> #include <net/gen/tcp_io.h>

2
minix/commands/syslogd/syslogd.c
View file

@ -102,7 +102,7 @@
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/udp.h> #include <net/gen/udp.h>
#include <net/gen/udp_io.h> #include <net/gen/udp_io.h>
#include <net/gen/netdb.h> #include <netdb.h>
#define SYSLOG_NAMES #define SYSLOG_NAMES
#include <syslog.h> #include <syslog.h>

2
minix/commands/tcpd/tcpd.c
View file

@ -19,7 +19,7 @@ tcpd.c
#include <net/netlib.h> #include <net/netlib.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/tcp.h> #include <net/gen/tcp.h>
#include <net/gen/tcp_io.h> #include <net/gen/tcp_io.h>

2
minix/commands/tcpdp/tcpd.c
View file

@ -19,7 +19,7 @@ tcpd.c
#include <net/netlib.h> #include <net/netlib.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/tcp.h> #include <net/gen/tcp.h>
#include <net/gen/tcp_io.h> #include <net/gen/tcp_io.h>

2
minix/commands/tcpstat/tcpstat.c
View file

@ -21,7 +21,7 @@ Created: June 1995 by Philip Homburg <philip@f-mnx.phicoh.com>
#endif #endif
#include <net/netlib.h> #include <net/netlib.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <minix/queryparam.h> #include <minix/queryparam.h>
#include <minix/com.h> #include <minix/com.h>

2
minix/commands/telnet/ttn.c
View file

@ -18,7 +18,7 @@ ttn.c
#include <net/netlib.h> #include <net/netlib.h>
#include <net/gen/in.h> #include <net/gen/in.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/tcp.h> #include <net/gen/tcp.h>
#include <net/gen/tcp_io.h> #include <net/gen/tcp_io.h>
#include "ttn.h" #include "ttn.h"

2
minix/commands/telnetd/main.c
View file

@ -33,7 +33,7 @@
#include <net/gen/tcp.h> #include <net/gen/tcp.h>
#include <net/gen/tcp_io.h> #include <net/gen/tcp_io.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include "telnetd.h" #include "telnetd.h"

2
minix/commands/udpstat/udpstat.c
View file

@ -22,7 +22,7 @@ Created: March 2001 by Philip Homburg <philip@f-mnx.phicoh.com>
#endif #endif
#include <net/netlib.h> #include <net/netlib.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/netdb.h> #include <netdb.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <minix/queryparam.h> #include <minix/queryparam.h>

4
minix/drivers/Makefile.inc
View file

@ -1,7 +1,7 @@
BINDIR?= /service BINDIR?= /service
MAN?= MAN?=
LDADD+= -lminlib -lcompat_minix LDADD+= -lminlib
DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} DPADD+= ${LIBMINLIB}
.include "../Makefile.inc" .include "../Makefile.inc"

1
minix/drivers/storage/ramdisk/Makefile
View file

@ -99,7 +99,6 @@ RAMDISK_DYNAMIC= 1
PROGRAMS+= ld.elf_so PROGRAMS+= ld.elf_so
PROG_LIBS+= libc PROG_LIBS+= libc
PROG_MINIXLIBS+= libminlib PROG_MINIXLIBS+= libminlib
PROG_MINIXLIBS+= libcompat_minix
PROG_MINIXLIBS+= libterminfo PROG_MINIXLIBS+= libterminfo
.endif .endif

1
minix/drivers/storage/ramdisk/proto.common.dynamic
View file

@ -5,7 +5,6 @@
lib d--755 0 0 lib d--755 0 0
libc.so.0 ---755 0 0 libc.so.0 libc.so.0 ---755 0 0 libc.so.0
libminlib.so.0 ---755 0 0 libminlib.so.0 libminlib.so.0 ---755 0 0 libminlib.so.0
libcompat_minix.so.0 ---755 0 0 libcompat_minix.so.0
libterminfo.so.0 ---755 0 0 libterminfo.so.0 libterminfo.so.0 ---755 0 0 libterminfo.so.0
$ $
$ $

4
minix/fs/Makefile.inc
View file

@ -1,7 +1,7 @@
BINDIR?= /service BINDIR?= /service
MAN?= MAN?=
LDADD+= -lminlib -lcompat_minix LDADD+= -lminlib
DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} DPADD+= ${LIBMINLIB}
.include "../Makefile.inc" .include "../Makefile.inc"

2
minix/include/Makefile
View file

@ -2,7 +2,7 @@
NOOBJ= # defined NOOBJ= # defined
INCS+= env.h fetch.h lib.h libutil.h varargs.h INCS+= env.h fetch.h lib.h libutil.h varargs.h configfile.h
.include <bsd.own.mk> .include <bsd.own.mk>

0
minix/lib/libcompat_minix/include/configfile.h → minix/include/configfile.h
View file

1
minix/lib/Makefile
View file

@ -12,7 +12,6 @@ SUBDIR+= libaudiodriver
SUBDIR+= libbdev SUBDIR+= libbdev
SUBDIR+= libblockdriver SUBDIR+= libblockdriver
SUBDIR+= libchardriver SUBDIR+= libchardriver
SUBDIR+= libcompat_minix
SUBDIR+= libddekit SUBDIR+= libddekit
SUBDIR+= libdevman SUBDIR+= libdevman
SUBDIR+= libexec SUBDIR+= libexec

2
minix/lib/libc/Makefile.inc
View file

@ -3,4 +3,4 @@
SRCS+= minix-malloc.c minix-calloc.c SRCS+= minix-malloc.c minix-calloc.c
SRCS+= minix-malloc-debug.c SRCS+= minix-malloc-debug.c
SRCS+= configfile.c mtab.c stderr.c

0
minix/lib/libcompat_minix/configfile.c → minix/lib/libc/gen/configfile.c
View file

0
minix/lib/libcompat_minix/mtab.c → minix/lib/libc/gen/mtab.c
View file

0
minix/lib/libcompat_minix/stderr.c → minix/lib/libc/gen/stderr.c
View file

26
minix/lib/libcompat_minix/Makefile
View file

@ -1,26 +0,0 @@
NOGCCERROR=yes
NOCLANGERROR=yes
.include <bsd.own.mk>
LIB= compat_minix
USE_SHLIBDIR= yes
.PATH: ${.CURDIR}
# std_err()
SRCS+= stderr.c
# Configfile Library.
SRCS+= configfile.c
# Minix 'mtab' handling functions.
#
# These should be changed when we switch to
# NetBSD's 'mtab' format.
SRCS+= mtab.c
SUBDIR+= pkgconfig include
.include <bsd.lib.mk>
.include <bsd.subdir.mk>

12
minix/lib/libcompat_minix/include/Makefile
View file

@ -1,12 +0,0 @@
INCSDIR= /usr/include
INCS+= configfile.h
NOOBJ= # defined
SUBDIR+= ${MACHINE_ARCH}
SUBDIR+= net sys
.include <bsd.prog.mk>
.include <bsd.subdir.mk>

8
minix/lib/libcompat_minix/include/earm/Makefile
View file

@ -1,8 +0,0 @@
INCSDIR= /usr/include/arm
INCS= compat_jmp_buf.h
NOOBJ= # defined
.include <bsd.prog.mk>

16
minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h
View file

@ -1,16 +0,0 @@
#ifndef _COMPAT_MACHINE_JMP_BUF_H
#define _COMPAT_MACHINE_JMP_BUF_H
/* This file is strictly dependant on the libc's
* setjmp/longjmp code! Keep it in sync! */
/* This is used only by libddekit's src/thread.c.
* Being incredibly fragile (not to mention hardly
* portable, it would be a good idea to replace
* that code. */
#define JB_PC 148
#define JB_SP 144
#define JB_BP 136
#endif /* _COMPAT_MACHINE_JMP_BUF_H */

8
minix/lib/libcompat_minix/include/i386/Makefile
View file

@ -1,8 +0,0 @@
INCSDIR= /usr/include/${MACHINE_ARCH}
INCS= compat_jmp_buf.h
NOOBJ= # defined
.include <bsd.prog.mk>

16
minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h
View file

@ -1,16 +0,0 @@
#ifndef _COMPAT_MACHINE_JMP_BUF_H
#define _COMPAT_MACHINE_JMP_BUF_H
/* This file is strictly dependant on the libc's
* setjmp/longjmp code! Keep it in sync! */
/* This is used only by libddekit's src/thread.c.
* Being incredibly fragile (not to mention hardly
* portable, it would be a good idea to replace
* that code. */
#define JB_PC 0
#define JB_SP 8
#define JB_BP 12
#endif /* _COMPAT_MACHINE_JMP_BUF_H */

4
minix/lib/libcompat_minix/include/net/Makefile
View file

@ -1,4 +0,0 @@
SUBDIR+= gen
.include <bsd.subdir.mk>

8
minix/lib/libcompat_minix/include/net/gen/Makefile
View file

@ -1,8 +0,0 @@
INCSDIR= /usr/include/net/gen
INCS= netdb.h resolv.h nameser.h
NOOBJ= # defined
.include <bsd.prog.mk>

5
minix/lib/libcompat_minix/include/net/gen/nameser.h
View file

@ -1,5 +0,0 @@
/*
* Minix compatibility.
*/
#include <arpa/nameser.h>

5
minix/lib/libcompat_minix/include/net/gen/netdb.h
View file

@ -1,5 +0,0 @@
/*
* Minix compatibility.
*/
#include <netdb.h>

5
minix/lib/libcompat_minix/include/net/gen/resolv.h
View file

@ -1,5 +0,0 @@
/*
* Minix compatibility.
*/
#include <resolv.h>

8
minix/lib/libcompat_minix/include/sys/Makefile
View file

@ -1,8 +0,0 @@
INCSDIR= /usr/include/sys
INCS= jmp_buf.h
NOOBJ= # defined
.include <bsd.prog.mk>

2
minix/lib/libcompat_minix/include/sys/jmp_buf.h
View file

@ -1,2 +0,0 @@
/* Stub for libddekit. Hopefully this will go away soon. */
#include <machine/compat_jmp_buf.h>

9
minix/lib/libcompat_minix/pkgconfig/Makefile
View file

@ -1,9 +0,0 @@
NOOBJ= # defined
.include <bsd.own.mk>
FILES=compat_minix.pc
FILESDIR=/usr/lib
FILESMODE=444
.include <bsd.prog.mk>

4
minix/lib/libcompat_minix/pkgconfig/compat_minix.pc
View file

@ -1,4 +0,0 @@
Name: compat_minix
Description: Minix Compatibility Library
Version: 1.0
Libs: -lcompat_minix

2
minix/lib/libcompat_minix/shlib_version
View file

@ -1,2 +0,0 @@
major=0
minor=0

2
minix/lib/libminlib/servxcheck.c
View file

@ -23,7 +23,7 @@
#include <net/gen/tcp_io.h> #include <net/gen/tcp_io.h>
#include <net/gen/inet.h> #include <net/gen/inet.h>
#include <net/gen/socket.h> #include <net/gen/socket.h>
#include <net/gen/netdb.h> #include <netdb.h>
/* Default service access file. */ /* Default service access file. */
static const char *path_servacces = _PATH_SERVACCES; static const char *path_servacces = _PATH_SERVACCES;

4
minix/net/Makefile.inc
View file

@ -1,7 +1,7 @@
BINDIR?= /service BINDIR?= /service
MAN?= MAN?=
LDADD+= -lminlib -lcompat_minix LDADD+= -lminlib
DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} DPADD+= ${LIBMINLIB}
.include "../Makefile.inc" .include "../Makefile.inc"

4
minix/servers/Makefile.inc
View file

@ -1,7 +1,7 @@
BINDIR?= /service BINDIR?= /service
MAN?= MAN?=
LDADD+= -lminlib -lcompat_minix LDADD+= -lminlib
DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} DPADD+= ${LIBMINLIB}
.include "../Makefile.inc" .include "../Makefile.inc"

2
minix/tests/Makefile
View file

@ -15,7 +15,7 @@ BINOWN= bin
FILES= test1.c FILES= test1.c
CFLAGS+= -fno-builtin CFLAGS+= -fno-builtin
LDADD+= -lm -lcompat_minix LDADD+= -lm
.include <bsd.own.mk> .include <bsd.own.mk>

4
minix/tests/blocktest/Makefile.inc
View file

@ -1,4 +1,4 @@
# Copied from drivers/Makefile.inc, and slightly edited. # Copied from drivers/Makefile.inc, and slightly edited.
LDADD+= -lminlib -lcompat_minix LDADD+= -lminlib
DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} DPADD+= ${LIBMINLIB}
BINDIR?=/usr/sbin BINDIR?=/usr/sbin

4
minix/tests/ds/Makefile.inc
View file

@ -1,4 +1,4 @@
# Copied from drivers/Makefile.inc # Copied from drivers/Makefile.inc
LDADD+= -lminlib -lcompat_minix LDADD+= -lminlib
DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} DPADD+= ${LIBMINLIB}
BINDIR?=/usr/sbin BINDIR?=/usr/sbin

4
minix/tests/kernel/sys_vumap/Makefile.inc
View file

@ -1,4 +1,4 @@
# Copied from drivers/Makefile.inc # Copied from drivers/Makefile.inc
LDADD+= -lminlib -lcompat_minix LDADD+= -lminlib
DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} DPADD+= ${LIBMINLIB}
BINDIR?=/usr/sbin BINDIR?=/usr/sbin

4
minix/tests/safecopy/Makefile
View file

@ -2,10 +2,10 @@ all: requestor grantor 1fifo 2fifo
chmod +x down run chmod +x down run
requestor: requestor.c inc.h requestor: requestor.c inc.h
cc -static -o $@ $< -lsys -lminlib -lcompat_minix cc -static -o $@ $< -lsys -lminlib
grantor: grantor.c inc.h grantor: grantor.c inc.h
cc -static -o $@ $< -lsys -lminlib -lcompat_minix cc -static -o $@ $< -lsys -lminlib
1fifo 2fifo: 1fifo 2fifo:
mkfifo $@ mkfifo $@

2
minix/usr.sbin/mkfs.mfs/Makefile.mkfs
View file

@ -11,7 +11,7 @@ CPPFLAGS+= -I${.CURDIR}
.if ${HOST_OSTYPE:C/\-.*//:U} == "Minix" || !defined(HOSTPROGNAME) .if ${HOST_OSTYPE:C/\-.*//:U} == "Minix" || !defined(HOSTPROGNAME)
#LSC: FIXME This should not be required, more so only on Minix... #LSC: FIXME This should not be required, more so only on Minix...
LDADD+= -lminlib -lcompat_minix LDADD+= -lminlib
DPADD+= ${MINLIB} ${COMPAT_MINIX} DPADD+= ${MINLIB} ${COMPAT_MINIX}
.endif .endif

1
share/mk/bsd.prog.mk
View file

@ -216,7 +216,6 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
blockdriver \ blockdriver \
chardriver \ chardriver \
clkconf \ clkconf \
compat_minix \
ddekit \ ddekit \
ddekit_usb_client \ ddekit_usb_client \
ddekit_usb_server \ ddekit_usb_server \

4
tools/Makefile.host
View file

@ -13,10 +13,6 @@ NOMAN= # defined
HOSTEXEEXT=.exe HOSTEXEEXT=.exe
.endif .endif
.if ${HOST_OSTYPE:C/\-.*//} == "Minix"
LDADD+= -lcompat_minix
.endif # ${HOST_OSTYPE:C/\-.*//} == "Minix"
# Resolve pathnames in variables. # Resolve pathnames in variables.
_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD HOST_CPPFLAGS LDADD _RESOLVE_VARS= CFLAGS CPPFLAGS DPADD HOST_CPPFLAGS LDADD
.for var in ${_RESOLVE_VARS} .for var in ${_RESOLVE_VARS}