Author: ngie Date: Tue Jan 12 18:24:22 2016 New Revision: 293778 URL: https://svnweb.freebsd.org/changeset/base/293778
Log: 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 Modified: stable/10/sys/modules/if_gif/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/modules/if_gif/Makefile ============================================================================== --- stable/10/sys/modules/if_gif/Makefile Tue Jan 12 18:06:07 2016 (r293777) +++ stable/10/sys/modules/if_gif/Makefile Tue Jan 12 18:24:22 2016 (r293778) @@ -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 _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
