Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the build for MKCOMPAT=no. 

The t_user_ldt test needs the i386 compat library which is only built
when MKCOMPAT=yes.
This commit is contained in:
yhardy 2020-05-11 21:51:25 +00:00
parent 00d0504163
commit dd377fc593
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/sets/lists/debug/md.amd64
View File

@ -1,4 +1,4 @@
# $NetBSD: md.amd64,v 1.108 2020/04/26 09:08:40 maxv Exp $
# $NetBSD: md.amd64,v 1.109 2020/05/11 21:51:25 yhardy Exp $
./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx
./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat
./usr/lib/i386/libiberty_g.a comp-obsolete obsolete
@ -25,7 +25,7 @@
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait6.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitid.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitpid.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug debug,atf,compat
./usr/libdata/debug/usr/tests/lib/libnvmm/h_io_assist.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/modules/t_x86_pte.debug tests-sys-debug debug,atf

4
distrib/sets/lists/tests/md.amd64
View File

@ -1,4 +1,4 @@
# $NetBSD: md.amd64,v 1.10 2020/04/28 13:43:45 rjs Exp $
# $NetBSD: md.amd64,v 1.11 2020/05/11 21:51:25 yhardy Exp $
./usr/tests/kernel/arch/x86/Atffile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/Kyuafile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_wait tests-obsolete obsolete
@ -7,7 +7,7 @@
./usr/tests/kernel/arch/x86/t_ptrace_wait6 tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitid tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitpid tests-obsolete obsolete
./usr/tests/lib/libi386/t_user_ldt tests-lib-tests compattestfile,atf
./usr/tests/lib/libi386/t_user_ldt tests-lib-tests compattestfile,atf,compat
./usr/tests/lib/libnvmm/h_io_assist tests-lib-tests compattestfile,atf
./usr/tests/lib/libnvmm/t_io_assist tests-lib-tests compattestfile,atf
./usr/tests/lib/libnvmm/h_mem_assist tests-lib-tests compattestfile,atf

4
tests/lib/libi386/Makefile
View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.3 2020/04/20 12:08:08 joerg Exp $
# $NetBSD: Makefile,v 1.4 2020/05/11 21:51:25 yhardy Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libi386
.if ${MACHINE} == "amd64"
.if ${MACHINE} == "amd64" && ${MKCOMPAT} == "yes"
SHLIBINSTALLDIR= /usr/lib/i386
COPTS+= -m32
LDFLAGS+= -m32