tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove libcompat_minix as library

Browse Source 
Change-Id: I3add94fe79812f475f5b27d3adaaf7fb9abac153
This commit is contained in:
Ben Gras 2014-08-25 00:19:34 +02:00
parent 22ec4ddb7a
commit a773dd50e4
27 changed files with 28 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
distrib/sets/lists/minix/mi
View File

@ -1856,7 +1856,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
@ -1912,7 +1912,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
@ -1989,11 +1989,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

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"

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 <bsd.lib.mk>
.include <bsd.subdir.mk>

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

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}