Module Name: src
Committed By: kre
Date: Sat Jun 1 06:59:18 UTC 2019
Modified Files:
src/tests/dev/usb/t_hid: Makefile
src/tests/lib/semaphore/pthread: Makefile
src/tests/net/bpfjit: Makefile
src/tests/net/icmp: Makefile
src/tests/net/if: Makefile
src/tests/net/if_loop: Makefile
src/tests/rump/rumpkern/h_server: Makefile
src/usr.bin/rump_server: Makefile
Log Message:
Deal with fallout from the addition of
KERN_PROC_CWD in sysctl(3)
That is kern.proc.$$.KERN_PROC_CWD (I think - not that it matters here)
The effect is that -lrump now requires -lrumpvfs
This set of changes fixes (I believe) regular dynamic builds,
more might be required for static builds (will be verified soon).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/dev/usb/t_hid/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/semaphore/pthread/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tests/net/bpfjit/Makefile
cvs rdiff -u -r1.10 -r1.11 src/tests/net/icmp/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tests/net/if/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_loop/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/rump/rumpkern/h_server/Makefile
cvs rdiff -u -r1.12 -r1.13 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/tests/dev/usb/t_hid/Makefile
diff -u src/tests/dev/usb/t_hid/Makefile:1.2 src/tests/dev/usb/t_hid/Makefile:1.3
--- src/tests/dev/usb/t_hid/Makefile:1.2 Sun Dec 10 20:38:14 2017
+++ src/tests/dev/usb/t_hid/Makefile Sat Jun 1 06:59:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/12/10 20:38:14 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2019/06/01 06:59:17 kre Exp $
#
PROG= t_hid
@@ -23,6 +23,7 @@ DPADD+= ${ATF_C}
LDADD+= -latf-c
LDADD+= -lrump
LDADD+= -lrumpuser
+LDADD+= -lrumpvfs
LDADD+= -lpthread
.include <bsd.prog.mk>
Index: src/tests/lib/semaphore/pthread/Makefile
diff -u src/tests/lib/semaphore/pthread/Makefile:1.4 src/tests/lib/semaphore/pthread/Makefile:1.5
--- src/tests/lib/semaphore/pthread/Makefile:1.4 Sat Jan 23 21:22:49 2016
+++ src/tests/lib/semaphore/pthread/Makefile Sat Jun 1 06:59:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:49 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/06/01 06:59:17 kre Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ TESTS_C= t_sem_pth
CPPFLAGS+= -I${.CURDIR}/.. -D_KERNTYPES
-LDADD+= -lrump -lrumpuser -lrump -lpthread
+LDADD+= -lrump -lrumpuser -lrump -lrumpvfs -lpthread
WARNS= 4
Index: src/tests/net/bpfjit/Makefile
diff -u src/tests/net/bpfjit/Makefile:1.7 src/tests/net/bpfjit/Makefile:1.8
--- src/tests/net/bpfjit/Makefile:1.7 Mon May 13 17:55:08 2019
+++ src/tests/net/bpfjit/Makefile Sat Jun 1 06:59:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/05/13 17:55:08 bad Exp $
+# $NetBSD: Makefile,v 1.8 2019/06/01 06:59:17 kre Exp $
#
.include <bsd.own.mk>
@@ -14,6 +14,6 @@ PAXCTL_FLAGS= +m
LDADD+= -lrumpnet_bpfjit -lrumpkern_sljit
LDADD+= -lrumpdev_bpf -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpuser -lpthread
+LDADD+= -lrump -lrumpvfs -lrumpuser -lpthread
.include <bsd.test.mk>
Index: src/tests/net/icmp/Makefile
diff -u src/tests/net/icmp/Makefile:1.10 src/tests/net/icmp/Makefile:1.11
--- src/tests/net/icmp/Makefile:1.10 Mon May 13 17:55:08 2019
+++ src/tests/net/icmp/Makefile Sat Jun 1 06:59:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/05/13 17:55:08 bad Exp $
+# $NetBSD: Makefile,v 1.11 2019/06/01 06:59:17 kre Exp $
#
.include <bsd.own.mk>
@@ -14,6 +14,6 @@ TESTS_SH_SRC_t_${name}= ../net_common.sh
.endfor
LDADD+= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpuser -lrump -lpthread
+LDADD+= -lrump -lrumpvfs -lrumpuser -lrump -lpthread
.include <bsd.test.mk>
Index: src/tests/net/if/Makefile
diff -u src/tests/net/if/Makefile:1.8 src/tests/net/if/Makefile:1.9
--- src/tests/net/if/Makefile:1.8 Mon May 13 17:55:08 2019
+++ src/tests/net/if/Makefile Sat Jun 1 06:59:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/05/13 17:55:08 bad Exp $
+# $NetBSD: Makefile,v 1.9 2019/06/01 06:59:17 kre Exp $
#
.include <bsd.own.mk>
@@ -16,6 +16,6 @@ MAN.ifconf= # empty
BINDIR.ifconf= ${TESTSDIR}
LDADD.t_compat= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump
-LDADD.t_compat+= -lrumpuser -lrump -lpthread
+LDADD.t_compat+= -lrumpuser -lrump -lrumpvfs -lpthread
.include <bsd.test.mk>
Index: src/tests/net/if_loop/Makefile
diff -u src/tests/net/if_loop/Makefile:1.5 src/tests/net/if_loop/Makefile:1.6
--- src/tests/net/if_loop/Makefile:1.5 Mon May 13 17:55:08 2019
+++ src/tests/net/if_loop/Makefile Sat Jun 1 06:59:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/05/13 17:55:08 bad Exp $
+# $NetBSD: Makefile,v 1.6 2019/06/01 06:59:17 kre Exp $
#
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ TESTSDIR= ${TESTSBASE}/net/if_loop
TESTS_C= t_pr
LDADD+= -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+= -lrump -lrumpuser -lrump -lpthread
+LDADD+= -lrump -lrumpvfs -lrumpuser -lrump -lpthread
.for name in basic
TESTS_SH+= t_${name}
Index: src/tests/rump/rumpkern/h_server/Makefile
diff -u src/tests/rump/rumpkern/h_server/Makefile:1.5 src/tests/rump/rumpkern/h_server/Makefile:1.6
--- src/tests/rump/rumpkern/h_server/Makefile:1.5 Wed Jan 7 22:24:03 2015
+++ src/tests/rump/rumpkern/h_server/Makefile Sat Jun 1 06:59:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/01/07 22:24:03 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2019/06/01 06:59:17 kre Exp $
#
.include <bsd.own.mk>
@@ -9,7 +9,7 @@ TESTS_C= h_simpleserver
ATFFILE= no
-LDADD+= -lrumpkern_sysproxy -lrump -lrumpuser -lrump -lpthread
+LDADD+= -lrumpkern_sysproxy -lrump -lrumpuser -lrump -lrumpvfs -lpthread
WARNS= 4
NOMAN=
Index: src/usr.bin/rump_server/Makefile
diff -u src/usr.bin/rump_server/Makefile:1.12 src/usr.bin/rump_server/Makefile:1.13
--- src/usr.bin/rump_server/Makefile:1.12 Thu May 11 04:33:14 2017
+++ src/usr.bin/rump_server/Makefile Sat Jun 1 06:59:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/05/11 04:33:14 sevan Exp $
+# $NetBSD: Makefile,v 1.13 2019/06/01 06:59:18 kre Exp $
#
.PATH: ${.CURDIR}/../rump_allserver
@@ -7,7 +7,7 @@ PROG= rump_server
SRCS= rump_allserver.c
NOMAN= installed by ../rump_allserver
-LDADD+= -Wl,--whole-archive -lrumpkern_sysproxy -lrump \
+LDADD+= -Wl,--whole-archive -lrumpkern_sysproxy -lrump -lrumpvfs \
-lrumpuser -Wl,--no-whole-archive -lpthread
.include <bsd.prog.mk>
