summaryrefslogtreecommitdiff
path: root/net/netbsd-tap
diff options
context:
space:
mode:
authorcube <cube@pkgsrc.org>2005-02-20 21:50:57 +0000
committercube <cube@pkgsrc.org>2005-02-20 21:50:57 +0000
commit0c09c0588f99ab5fceeda72a46226d871d6122b3 (patch)
tree84b5cc8d13f54864f68007bdcbe276e1b0ec1d23 /net/netbsd-tap
parent90d0b1a41ea6e97e41de3e95be9afe67edf5ba92 (diff)
downloadpkgsrc-0c09c0588f99ab5fceeda72a46226d871d6122b3.tar.gz
o Add a way to pass special definitions to the compilation, to match kernel
environment, and document it in DESCR by lack of a better place. o Fix a reference to local in (yet unused) bl3.mk file. Both issues reported by Hubert Feyrer.
Diffstat (limited to 'net/netbsd-tap')
-rw-r--r--net/netbsd-tap/DESCR8
-rw-r--r--net/netbsd-tap/Makefile4
-rw-r--r--net/netbsd-tap/buildlink3.mk4
-rw-r--r--net/netbsd-tap/files/Makefile5
-rw-r--r--net/netbsd-tap/options.mk6
5 files changed, 21 insertions, 6 deletions
diff --git a/net/netbsd-tap/DESCR b/net/netbsd-tap/DESCR
index 28cf9ab2d5b..5c5e80c5c59 100644
--- a/net/netbsd-tap/DESCR
+++ b/net/netbsd-tap/DESCR
@@ -8,3 +8,11 @@ allows an application to read and inject Ethernet frames into the network
stack. tap(4) devices can be created and used individually for system-wide
configurations, but an application can also use a special clonable device
node to create interfaces on demand.
+
+As a LKM must be compiled with the same environment as the kernel with respect
+to a handful of definition (DEBUG, DIAGNOSTIC, MULTIPROCESSOR, LOCKDEBUG and
+MALLOCLOG), the package provides a variable, TAP_KERNEL_ENV, to hold the
+correct addition to the compilation command line. For example, you might want
+to define it the following way in mk.conf:
+
+ TAP_KERNEL_ENV= -DDIAGNOSTIC -DMULTIPROCESSOR
diff --git a/net/netbsd-tap/Makefile b/net/netbsd-tap/Makefile
index c54d49d2a1f..042462b116c 100644
--- a/net/netbsd-tap/Makefile
+++ b/net/netbsd-tap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2005/02/15 21:23:07 cube Exp $
+# $NetBSD: Makefile,v 1.3 2005/02/20 21:50:57 cube Exp $
-DISTNAME= netbsd-tap-20050215
+DISTNAME= netbsd-tap-20050220
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/net/netbsd-tap/buildlink3.mk b/net/netbsd-tap/buildlink3.mk
index a5f26cbc2b1..d74e7661daf 100644
--- a/net/netbsd-tap/buildlink3.mk
+++ b/net/netbsd-tap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/01/20 18:02:39 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/02/20 21:50:57 cube Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETBSD_TAP_BUILDLINK3_MK:= ${NETBSD_TAP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= netbsd-tap
.if !empty(NETBSD_TAP_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.netbsd-tap+= netbsd-tap>=20050120
-BUILDLINK_PKGSRCDIR.netbsd-tap?= ../../local/netbsd-tap
+BUILDLINK_PKGSRCDIR.netbsd-tap?= ../../net/netbsd-tap
.endif # NETBSD_TAP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/netbsd-tap/files/Makefile b/net/netbsd-tap/files/Makefile
index 01d81b5a0cb..31f4dfc56e5 100644
--- a/net/netbsd-tap/files/Makefile
+++ b/net/netbsd-tap/files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/20 18:02:40 cube Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/20 21:50:57 cube Exp $
SRCS= if_tap_lkm.c if_tap.c if_tap_stub.c
KMOD= tap
@@ -13,6 +13,9 @@ MANDIR= ${PREFIX}/man
.if defined(USE_BPF) && !empty(USE_BPF:M[Yy][Ee][Ss])
CPPFLAGS+= -DNBPFILTER=1
.endif
+.if defined(TAP_KERNEL_ENV) && !empty(TAP_KERNEL_ENV)
+CPPFLAGS+= ${TAP_KERNEL_ENV}
+.endif
install: install-postinstall
diff --git a/net/netbsd-tap/options.mk b/net/netbsd-tap/options.mk
index 81ad0d9d357..9b14ab2c42f 100644
--- a/net/netbsd-tap/options.mk
+++ b/net/netbsd-tap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/01/20 18:02:39 cube Exp $
+# $NetBSD: options.mk,v 1.2 2005/02/20 21:50:57 cube Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.netbsd-tap
PKG_SUPPORTED_OPTIONS= bpf
@@ -9,3 +9,7 @@ PKG_DEFAULT_OPTIONS?= bpf
.if !empty(PKG_OPTIONS:Mbpf)
BUILD_ENV+= USE_BPF=YES
.endif
+
+TAP_KERNEL_ENV?= # empty
+BUILD_DEFS+= TAP_KERNEL_ENV
+MAKE_ENV+= TAP_KERNEL_ENV=${TAP_KERNEL_ENV:Q}