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

Revert previous change so builds can resume.

Browse Source 
_KERNTYPES needs to be defined for NetBSD builds to succeed.
_KERNTYPES must not be defined for buildrum.sh builds to succeed.
This commit is contained in:
sevan 2017-05-10 08:48:46 +00:00
parent 182021eabb
commit 979875ac74
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/librumpclient/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2017/05/10 01:11:51 sevan Exp $ # $NetBSD: Makefile,v 1.13 2017/05/10 08:48:46 sevan Exp $
# #
.PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern .PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern
@ -17,7 +17,7 @@ LIBDO.${lib}= _external
LIBDPLIBS+= ${lib} lib LIBDPLIBS+= ${lib} lib
.endfor .endfor
CPPFLAGS+= -DRUMP_CLIENT CPPFLAGS+= -DRUMP_CLIENT -D_KERNTYPES
CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR} CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR}
CPPFLAGS+= -I${.CURDIR}/../librumpuser CPPFLAGS+= -I${.CURDIR}/../librumpuser
SRCS= rumpclient.c SRCS= rumpclient.c

4
lib/librumphijack/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.18 2017/05/10 01:11:51 sevan Exp $ # $NetBSD: Makefile,v 1.19 2017/05/10 08:48:46 sevan Exp $
# #
LIB= rumphijack LIB= rumphijack
@ -10,7 +10,7 @@ MAN= rumphijack.3
SRCS= hijack.c hijackdlsym.c SRCS= hijack.c hijackdlsym.c
CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT -D_KERNTYPES
WARNS?= 5 WARNS?= 5

4
lib/librumpuser/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.25 2017/05/10 01:11:52 sevan Exp $ # $NetBSD: Makefile,v 1.26 2017/05/10 08:48:46 sevan Exp $
# #
.include <bsd.own.mk> .include <bsd.own.mk>
@ -19,7 +19,7 @@ LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
LIBDO.${lib}= _external LIBDO.${lib}= _external
LIBDPLIBS+= ${lib} lib LIBDPLIBS+= ${lib} lib
.endfor .endfor
CPPFLAGS+= -DLIBRUMPUSER CPPFLAGS+= -DLIBRUMPUSER -D_KERNTYPES
#CPPFLAGS+= -D_DIAGNOSTIC #CPPFLAGS+= -D_DIAGNOSTIC

3
usr.bin/rump_allserver/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2017/05/10 01:11:52 sevan Exp $ # $NetBSD: Makefile,v 1.10 2017/05/10 08:48:46 sevan Exp $
# #
PROG= rump_allserver PROG= rump_allserver
@ -13,5 +13,6 @@ RUMPTOP=${.CURDIR}/../../sys/rump
LDADD+= ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD} LDADD+= ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD}
LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread
CPPFLAGS+= -D_KERNTYPES
.include <bsd.prog.mk> .include <bsd.prog.mk>

3
usr.bin/rump_server/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2017/05/10 01:11:52 sevan Exp $ # $NetBSD: Makefile,v 1.11 2017/05/10 08:48:46 sevan Exp $
# #
.PATH: ${.CURDIR}/../rump_allserver .PATH: ${.CURDIR}/../rump_allserver
@ -7,6 +7,7 @@ PROG= rump_server
SRCS= rump_allserver.c SRCS= rump_allserver.c
NOMAN= installed by ../rump_allserver NOMAN= installed by ../rump_allserver
CPPFLAGS+= -D_KERNTYPES
LDADD+= -Wl,--whole-archive -lrumpkern_sysproxy -lrump \ LDADD+= -Wl,--whole-archive -lrumpkern_sysproxy -lrump \
-lrumpuser -Wl,--no-whole-archive -lpthread -lrumpuser -Wl,--no-whole-archive -lpthread