diff options
| author | ngie <ngie@FreeBSD.org> | 2016-01-12 18:24:22 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-01-12 18:24:22 +0000 |
| commit | 5d45988feff4bfc6f2869586aff94a708392c0d5 (patch) | |
| tree | 5aab19333d9dde845879e324af6c7bc1f4d93668 /sys/modules | |
| parent | f24fbfc1e13f988571bd7978a3ed5355b840feaf (diff) | |
| download | FreeBSD-src-5d45988feff4bfc6f2869586aff94a708392c0d5.zip FreeBSD-src-5d45988feff4bfc6f2869586aff94a708392c0d5.tar.gz | |
Fix LINT-NOINET kernels
- Generate opt_inet.h appropriately according to MK_INET_SUPPORT
- Only add in_gif.c to SRCS if MK_INET_SUPPORT != no
This is a surgical fix since the build infrastructure has diverged sufficiently
between stable/10 and head.
This change will likely be reverted if and when imp's changes to config.mk have
been backported to ^/stable/10 .
Reviewed by: ae (no serious objections)
Differential Revision: https://reviews.freebsd.org/D4864
MFC after: 1 week
Sponsored by: EMCC / Isilon Storage Division
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/if_gif/Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile index a501dd6..d8ba44c 100644 --- a/sys/modules/if_gif/Makefile +++ b/sys/modules/if_gif/Makefile @@ -5,11 +5,18 @@ .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 KMOD= if_gif -SRCS= if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h +SRCS= if_gif.c opt_inet.h opt_inet6.h opt_mrouting.h .if !defined(KERNBUILDDIR) +.if ${MK_INET_SUPPORT} != "no" opt_inet.h: echo "#define INET 1" > ${.TARGET} +.endif +.else +OPT_INET!= cat ${KERNBUILDDIR}/opt_inet.h; echo +.if empty(OPT_INET) +MK_INET_SUPPORT= no +.endif .if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: @@ -25,6 +32,10 @@ MK_INET6_SUPPORT= no .endif .endif +.if ${MK_INET_SUPPORT} != "no" +SRCS+= in_gif.c +.endif + .if ${MK_INET6_SUPPORT} != "no" SRCS+= in6_gif.c .endif |
