Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Deal with fallout from the addition of



details:   https://anonhg.NetBSD.org/src/rev/72a41899620e
branches:  trunk
changeset: 456923:72a41899620e
user:      kre <kre%NetBSD.org@localhost>
date:      Sat Jun 01 06:59:17 2019 +0000

description:
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).

diffstat:

 tests/dev/usb/t_hid/Makefile          |  3 ++-
 tests/lib/semaphore/pthread/Makefile  |  4 ++--
 tests/net/bpfjit/Makefile             |  4 ++--
 tests/net/icmp/Makefile               |  4 ++--
 tests/net/if/Makefile                 |  4 ++--
 tests/net/if_loop/Makefile            |  4 ++--
 tests/rump/rumpkern/h_server/Makefile |  4 ++--
 usr.bin/rump_server/Makefile          |  4 ++--
 8 files changed, 16 insertions(+), 15 deletions(-)

diffs (140 lines):

diff -r 78dbd1b5cfbe -r 72a41899620e tests/dev/usb/t_hid/Makefile
--- a/tests/dev/usb/t_hid/Makefile      Sat Jun 01 06:57:03 2019 +0000
+++ b/tests/dev/usb/t_hid/Makefile      Sat Jun 01 06:59:17 2019 +0000
@@ -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 @@
 LDADD+= -latf-c
 LDADD+= -lrump
 LDADD+= -lrumpuser
+LDADD+= -lrumpvfs
 LDADD+= -lpthread
 
 .include <bsd.prog.mk>
diff -r 78dbd1b5cfbe -r 72a41899620e tests/lib/semaphore/pthread/Makefile
--- a/tests/lib/semaphore/pthread/Makefile      Sat Jun 01 06:57:03 2019 +0000
+++ b/tests/lib/semaphore/pthread/Makefile      Sat Jun 01 06:59:17 2019 +0000
@@ -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 @@
 
 CPPFLAGS+=     -I${.CURDIR}/.. -D_KERNTYPES
 
-LDADD+=                -lrump -lrumpuser -lrump -lpthread
+LDADD+=                -lrump -lrumpuser -lrump -lrumpvfs -lpthread
 
 WARNS= 4
 
diff -r 78dbd1b5cfbe -r 72a41899620e tests/net/bpfjit/Makefile
--- a/tests/net/bpfjit/Makefile Sat Jun 01 06:57:03 2019 +0000
+++ b/tests/net/bpfjit/Makefile Sat Jun 01 06:59:17 2019 +0000
@@ -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 @@
 
 LDADD+=                -lrumpnet_bpfjit -lrumpkern_sljit
 LDADD+=                -lrumpdev_bpf -lrumpnet_net -lrumpnet
-LDADD+=                -lrump -lrumpuser -lpthread
+LDADD+=                -lrump -lrumpvfs -lrumpuser -lpthread
 
 .include <bsd.test.mk>
diff -r 78dbd1b5cfbe -r 72a41899620e tests/net/icmp/Makefile
--- a/tests/net/icmp/Makefile   Sat Jun 01 06:57:03 2019 +0000
+++ b/tests/net/icmp/Makefile   Sat Jun 01 06:59:17 2019 +0000
@@ -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 @@
 .endfor
 
 LDADD+=                -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=                -lrump -lrumpuser -lrump -lpthread
+LDADD+=                -lrump -lrumpvfs -lrumpuser -lrump -lpthread
 
 .include <bsd.test.mk>
diff -r 78dbd1b5cfbe -r 72a41899620e tests/net/if/Makefile
--- a/tests/net/if/Makefile     Sat Jun 01 06:57:03 2019 +0000
+++ b/tests/net/if/Makefile     Sat Jun 01 06:59:17 2019 +0000
@@ -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 @@
 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>
diff -r 78dbd1b5cfbe -r 72a41899620e tests/net/if_loop/Makefile
--- a/tests/net/if_loop/Makefile        Sat Jun 01 06:57:03 2019 +0000
+++ b/tests/net/if_loop/Makefile        Sat Jun 01 06:59:17 2019 +0000
@@ -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 @@
 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}
diff -r 78dbd1b5cfbe -r 72a41899620e tests/rump/rumpkern/h_server/Makefile
--- a/tests/rump/rumpkern/h_server/Makefile     Sat Jun 01 06:57:03 2019 +0000
+++ b/tests/rump/rumpkern/h_server/Makefile     Sat Jun 01 06:59:17 2019 +0000
@@ -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 @@
 
 ATFFILE=       no
 
-LDADD+=        -lrumpkern_sysproxy -lrump -lrumpuser -lrump -lpthread
+LDADD+=        -lrumpkern_sysproxy -lrump -lrumpuser -lrump -lrumpvfs -lpthread
 
 WARNS= 4
 NOMAN=
diff -r 78dbd1b5cfbe -r 72a41899620e usr.bin/rump_server/Makefile
--- a/usr.bin/rump_server/Makefile      Sat Jun 01 06:57:03 2019 +0000
+++ b/usr.bin/rump_server/Makefile      Sat Jun 01 06:59:17 2019 +0000
@@ -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 @@
 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>



Home | Main Index | Thread Index | Old Index