From owner-svn-src-stable@freebsd.org Tue Jan 12 18:24:23 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC464A80456; Tue, 12 Jan 2016 18:24:23 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D557135A; Tue, 12 Jan 2016 18:24:23 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CIOMW5015447; Tue, 12 Jan 2016 18:24:22 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CIOMZD015446; Tue, 12 Jan 2016 18:24:22 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201601121824.u0CIOMZD015446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 12 Jan 2016 18:24:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r293778 - stable/10/sys/modules/if_gif X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2016 18:24:23 -0000 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