Module Name: src
Committed By: ozaki-r
Date: Tue Mar 14 14:05:52 UTC 2017
Modified Files:
src/usr.sbin/puffs/rump_nfs: Makefile
src/usr.sbin/puffs/rump_smbfs: Makefile
Log Message:
Fix build of puffs
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/puffs/rump_nfs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/puffs/rump_smbfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/rump_nfs/Makefile
diff -u src/usr.sbin/puffs/rump_nfs/Makefile:1.6 src/usr.sbin/puffs/rump_nfs/Makefile:1.7
--- src/usr.sbin/puffs/rump_nfs/Makefile:1.6 Tue Jul 20 14:42:03 2010
+++ src/usr.sbin/puffs/rump_nfs/Makefile Tue Mar 14 14:05:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/07/20 14:42:03 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2017/03/14 14:05:52 ozaki-r Exp $
#
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
MOUNTNAME= nfs
SRCS+= getnfsargs.c
-LDADD+= -lrumpfs_nfs -lrumpnet -lrumpnet_sockin
+LDADD+= -lrumpfs_nfs -lrumpdev -lrumpnet_net -lrumpnet -lrumpnet_sockin
ISRUMP= # gives me nightmares
#CPPFLAGS+= -DINET6 # for getnfsargs?
Index: src/usr.sbin/puffs/rump_smbfs/Makefile
diff -u src/usr.sbin/puffs/rump_smbfs/Makefile:1.7 src/usr.sbin/puffs/rump_smbfs/Makefile:1.8
--- src/usr.sbin/puffs/rump_smbfs/Makefile:1.7 Wed Dec 25 23:35:17 2013
+++ src/usr.sbin/puffs/rump_smbfs/Makefile Tue Mar 14 14:05:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/12/25 23:35:17 christos Exp $
+# $NetBSD: Makefile,v 1.8 2017/03/14 14:05:52 ozaki-r Exp $
#
SMBROOT=${.CURDIR}/../../../external/bsd/smbfs
@@ -7,7 +7,7 @@ MOUNTNAME= smbfs
SRCS+= smb_rumpops.c
PROGDPLIBS+= smb ${SMBROOT}/lib/libsmb
-LDADD+= -lrumpnet_sockin -lrumpnet
+LDADD+= -lrumpnet_sockin -lrumpnet_net -lrumpnet
LDADD+= -lrumpkern_crypto -lrumpdev_netsmb -lrumpdev
ISRUMP= # it is