Module Name: src Committed By: sevan Date: Wed May 10 08:48:46 UTC 2017
Modified Files: src/lib/librumpclient: Makefile src/lib/librumphijack: Makefile src/lib/librumpuser: Makefile src/usr.bin/rump_allserver: Makefile src/usr.bin/rump_server: Makefile Log Message: Revert previous change so builds can resume. _KERNTYPES needs to be defined for NetBSD builds to succeed. _KERNTYPES must not be defined for buildrum.sh builds to succeed. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/librumpclient/Makefile cvs rdiff -u -r1.18 -r1.19 src/lib/librumphijack/Makefile cvs rdiff -u -r1.25 -r1.26 src/lib/librumpuser/Makefile cvs rdiff -u -r1.9 -r1.10 src/usr.bin/rump_allserver/Makefile cvs rdiff -u -r1.10 -r1.11 src/usr.bin/rump_server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/librumpclient/Makefile diff -u src/lib/librumpclient/Makefile:1.12 src/lib/librumpclient/Makefile:1.13 --- src/lib/librumpclient/Makefile:1.12 Wed May 10 01:11:51 2017 +++ src/lib/librumpclient/Makefile Wed May 10 08:48:46 2017 @@ -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 @@ -17,7 +17,7 @@ LIBDO.${lib}= _external LIBDPLIBS+= ${lib} lib .endfor -CPPFLAGS+= -DRUMP_CLIENT +CPPFLAGS+= -DRUMP_CLIENT -D_KERNTYPES CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR} CPPFLAGS+= -I${.CURDIR}/../librumpuser SRCS= rumpclient.c Index: src/lib/librumphijack/Makefile diff -u src/lib/librumphijack/Makefile:1.18 src/lib/librumphijack/Makefile:1.19 --- src/lib/librumphijack/Makefile:1.18 Wed May 10 01:11:51 2017 +++ src/lib/librumphijack/Makefile Wed May 10 08:48:46 2017 @@ -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 @@ -10,7 +10,7 @@ MAN= rumphijack.3 SRCS= hijack.c hijackdlsym.c -CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT +CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT -D_KERNTYPES WARNS?= 5 Index: src/lib/librumpuser/Makefile diff -u src/lib/librumpuser/Makefile:1.25 src/lib/librumpuser/Makefile:1.26 --- src/lib/librumpuser/Makefile:1.25 Wed May 10 01:11:52 2017 +++ src/lib/librumpuser/Makefile Wed May 10 08:48:46 2017 @@ -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> @@ -19,7 +19,7 @@ LIBDPLIBS+= pthread ${.CURDIR}/../libpth LIBDO.${lib}= _external LIBDPLIBS+= ${lib} lib .endfor -CPPFLAGS+= -DLIBRUMPUSER +CPPFLAGS+= -DLIBRUMPUSER -D_KERNTYPES #CPPFLAGS+= -D_DIAGNOSTIC Index: src/usr.bin/rump_allserver/Makefile diff -u src/usr.bin/rump_allserver/Makefile:1.9 src/usr.bin/rump_allserver/Makefile:1.10 --- src/usr.bin/rump_allserver/Makefile:1.9 Wed May 10 01:11:52 2017 +++ src/usr.bin/rump_allserver/Makefile Wed May 10 08:48:46 2017 @@ -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 @@ -13,5 +13,6 @@ RUMPTOP=${.CURDIR}/../../sys/rump LDADD+= ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD} LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread +CPPFLAGS+= -D_KERNTYPES .include <bsd.prog.mk> Index: src/usr.bin/rump_server/Makefile diff -u src/usr.bin/rump_server/Makefile:1.10 src/usr.bin/rump_server/Makefile:1.11 --- src/usr.bin/rump_server/Makefile:1.10 Wed May 10 01:11:52 2017 +++ src/usr.bin/rump_server/Makefile Wed May 10 08:48:46 2017 @@ -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 @@ -7,6 +7,7 @@ PROG= rump_server SRCS= rump_allserver.c NOMAN= installed by ../rump_allserver +CPPFLAGS+= -D_KERNTYPES LDADD+= -Wl,--whole-archive -lrumpkern_sysproxy -lrump \ -lrumpuser -Wl,--no-whole-archive -lpthread