Module Name: src
Committed By: sevan
Date: Wed May 10 01:11:52 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:
Do not define _KERNTYPES as this breaks build with buildrump.sh due to
conflicting types for register_t.
Closes PR kern/52206
Steered in the right direction by christos.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/librumpclient/Makefile
cvs rdiff -u -r1.17 -r1.18 src/lib/librumphijack/Makefile
cvs rdiff -u -r1.24 -r1.25 src/lib/librumpuser/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/rump_allserver/Makefile
cvs rdiff -u -r1.9 -r1.10 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.11 src/lib/librumpclient/Makefile:1.12
--- src/lib/librumpclient/Makefile:1.11 Sat Jan 23 21:22:46 2016
+++ src/lib/librumpclient/Makefile Wed May 10 01:11:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/01/23 21:22:46 christos Exp $
+# $NetBSD: Makefile,v 1.12 2017/05/10 01:11:51 sevan Exp $
#
.PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern
@@ -17,7 +17,7 @@ LIBDO.${lib}= _external
LIBDPLIBS+= ${lib} lib
.endfor
-CPPFLAGS+= -DRUMP_CLIENT -D_KERNTYPES
+CPPFLAGS+= -DRUMP_CLIENT
CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR}
CPPFLAGS+= -I${.CURDIR}/../librumpuser
SRCS= rumpclient.c
Index: src/lib/librumphijack/Makefile
diff -u src/lib/librumphijack/Makefile:1.17 src/lib/librumphijack/Makefile:1.18
--- src/lib/librumphijack/Makefile:1.17 Sat Jan 23 21:22:46 2016
+++ src/lib/librumphijack/Makefile Wed May 10 01:11:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/01/23 21:22:46 christos Exp $
+# $NetBSD: Makefile,v 1.18 2017/05/10 01:11:51 sevan Exp $
#
LIB= rumphijack
@@ -10,7 +10,7 @@ MAN= rumphijack.3
SRCS= hijack.c hijackdlsym.c
-CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT -D_KERNTYPES
+CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT
WARNS?= 5
Index: src/lib/librumpuser/Makefile
diff -u src/lib/librumpuser/Makefile:1.24 src/lib/librumpuser/Makefile:1.25
--- src/lib/librumpuser/Makefile:1.24 Sat Jan 23 21:22:46 2016
+++ src/lib/librumpuser/Makefile Wed May 10 01:11:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/01/23 21:22:46 christos Exp $
+# $NetBSD: Makefile,v 1.25 2017/05/10 01:11:52 sevan Exp $
#
.include <bsd.own.mk>
@@ -19,7 +19,7 @@ LIBDPLIBS+= pthread ${.CURDIR}/../libpth
LIBDO.${lib}= _external
LIBDPLIBS+= ${lib} lib
.endfor
-CPPFLAGS+= -DLIBRUMPUSER -D_KERNTYPES
+CPPFLAGS+= -DLIBRUMPUSER
#CPPFLAGS+= -D_DIAGNOSTIC
Index: src/usr.bin/rump_allserver/Makefile
diff -u src/usr.bin/rump_allserver/Makefile:1.8 src/usr.bin/rump_allserver/Makefile:1.9
--- src/usr.bin/rump_allserver/Makefile:1.8 Sat Jan 23 21:22:49 2016
+++ src/usr.bin/rump_allserver/Makefile Wed May 10 01:11:52 2017
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:49 christos Exp $
+# $NetBSD: Makefile,v 1.9 2017/05/10 01:11:52 sevan Exp $
#
PROG= rump_allserver
MLINKS+=rump_allserver.1 rump_server.1
RUMPTOP=${.CURDIR}/../../sys/rump
-CPPFLAGS+= -D_KERNTYPES
.include "${RUMPTOP}/dev/Makefile.rumpdevcomp"
.include "${RUMPTOP}/fs/Makefile.rumpfscomp"
Index: src/usr.bin/rump_server/Makefile
diff -u src/usr.bin/rump_server/Makefile:1.9 src/usr.bin/rump_server/Makefile:1.10
--- src/usr.bin/rump_server/Makefile:1.9 Sat Jan 23 21:22:50 2016
+++ src/usr.bin/rump_server/Makefile Wed May 10 01:11:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:50 christos Exp $
+# $NetBSD: Makefile,v 1.10 2017/05/10 01:11:52 sevan Exp $
#
.PATH: ${.CURDIR}/../rump_allserver
@@ -7,7 +7,6 @@ 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
