From eugen@k-45-monitor.sd.rdtc.ru  Mon Jul 29 05:45:28 2013
Return-Path: <eugen@k-45-monitor.sd.rdtc.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 48F3C13B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Jul 2013 05:45:28 +0000 (UTC)
	(envelope-from eugen@k-45-monitor.sd.rdtc.ru)
Received: from k-45-monitor.sd.rdtc.ru (k-45-monitor.sd.rdtc.ru [62.231.191.161])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id AA39F2C55
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Jul 2013 05:45:27 +0000 (UTC)
Received: from k-45-monitor.sd.rdtc.ru (localhost [127.0.0.1])
	by k-45-monitor.sd.rdtc.ru (8.14.7/8.14.7) with ESMTP id r6T5anKs000755;
	Mon, 29 Jul 2013 12:36:50 +0700 (NOVT)
	(envelope-from eugen@k-45-monitor.sd.rdtc.ru)
Received: (from eugen@localhost)
	by k-45-monitor.sd.rdtc.ru (8.14.7/8.14.7/Submit) id r6T5amis000746;
	Mon, 29 Jul 2013 12:36:48 +0700 (NOVT)
	(envelope-from eugen)
Message-Id: <201307290536.r6T5amis000746@k-45-monitor.sd.rdtc.ru>
Date: Mon, 29 Jul 2013 12:36:48 +0700 (NOVT)
From: Eugene Grosbein <egrosbein@rdtc.ru>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] [modules] stable/9 buildworld is broken with MODULES_WITH_WORLD=yes
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         180918
>Category:       misc
>Synopsis:       [patch] [modules] stable/9 buildworld is broken with MODULES_WITH_WORLD=yes
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 29 05:50:00 UTC 2013
>Closed-Date:    Mon Oct 07 12:58:45 UTC 2013
>Last-Modified:  Mon Oct  7 13:00:00 UTC 2013
>Originator:     Eugene Grosbein
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
RDTC JSC
>Environment:
System: FreeBSD k-45-monitor 9.1-STABLE FreeBSD 9.1-STABLE #9 r252026M: Thu Jun 20 20:09:10 NOVT 2013 root@k-45-monitor:/usr/obj/usr/local/src/sys/K-45-MONITOR amd64

>Description:

	make MODULES_WITH_WORLD=yes buildworld is broken for 9-STABLE:

===> sys/modules/ixgbe (depend)
machine -> /usr/local/src/sys/amd64/include
@ -> /usr/local/src/sys
x86 -> /usr/local/src/sys/x86/include
awk -f @/tools/makeobjops.awk @/dev/pci/pci_if.m -h
awk -f @/tools/makeobjops.awk @/kern/bus_if.m -h
awk -f @/tools/makeobjops.awk @/kern/device_if.m -h
rm -f .depend
mkdep -f .depend -a   -nostdinc -DSMP -DIXGBE_FDIR -D_KERNEL -DKLD_MODULE -I/usr/local/src/sys/modules/ixgbe/../../dev/ixgbe -I
. -I@ -I@/contrib/altq -std=iso9899:1999   /usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixgbe.c /usr/local/src/sys/modules/
ixgbe/../../dev/ixgbe/ixv.c /usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixgbe_common.c /usr/local/src/sys/modules/ixgbe/..
/../dev/ixgbe/ixgbe_api.c /usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixgbe_phy.c /usr/local/src/sys/modules/ixgbe/../../d
ev/ixgbe/ixgbe_mbx.c /usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixgbe_vf.c /usr/local/src/sys/modules/ixgbe/../../dev/ixg
be/ixgbe_dcb.c /usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixgbe_dcb_82598.c /usr/local/src/sys/modules/ixgbe/../../dev/ix
gbe/ixgbe_dcb_82599.c /usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixgbe_82599.c /usr/local/src/sys/modules/ixgbe/../../dev
/ixgbe/ixgbe_82598.c /usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixgbe_x540.c
/usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixgbe.c:36:22: error: opt_inet.h: No such file or directory
/usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixgbe.c:37:23: error: opt_inet6.h: No such file or directory
/usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixv.c:35:22: error: opt_inet.h: No such file or directory
/usr/local/src/sys/modules/ixgbe/../../dev/ixgbe/ixv.c:36:23: error: opt_inet6.h: No such file or directory
mkdep: compile failed
*** [.depend] Error code 1
1 error
*** [depend] Error code 2
1 error
*** [depend] Error code 2
1 error
*** [sys.depend__D] Error code 2

	Same for sys/modules/rdma/krping and sys/modules/toecore.

>How-To-Repeat:

	See above.

>Fix:

--- sys/modules/ixgbe/Makefile.orig	2013-07-29 11:27:57.000000000 +0700
+++ sys/modules/ixgbe/Makefile	2013-07-29 11:58:20.000000000 +0700
@@ -7,6 +7,15 @@
 SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
 SRCS    += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
 SRCS    += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
+SRCS	+= opt_inet.h opt_inet6.h
 CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR
 
+.if !defined(KERNBUILDDIR)
+opt_inet.h:
+	echo "#define INET 1" >> ${.TARGET}
+
+opt_inet6.h:
+	echo "#define INET6 1" >> ${.TARGET}
+.endif
+
 .include <bsd.kmod.mk>
--- sys/modules/rdma/krping/Makefile.orig	2013-07-29 10:49:55.000000000 +0700
+++ sys/modules/rdma/krping/Makefile	2013-07-29 12:05:47.000000000 +0700
@@ -5,8 +5,16 @@
 
 KMOD= krping
 SRCS= krping.c krping_dev.c getopt.c
-SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h
+SRCS+=  bus_if.h device_if.h opt_inet.h opt_inet6.h opt_sched.h pci_if.h pcib_if.h
 SRCS+=  vnode_if.h
 CFLAGS+= -I${.CURDIR}/../../../ofed/include 
 
+.if !defined(KERNBUILDDIR)
+opt_inet.h:
+	echo "#define INET 1" >> ${.TARGET}
+
+opt_inet6.h:
+	echo "#define INET6 1" >> ${.TARGET}
+.endif
+
 .include <bsd.kmod.mk>
--- sys/modules/toecore/Makefile.orig	2013-07-29 12:09:18.000000000 +0700
+++ sys/modules/toecore/Makefile	2013-07-29 12:09:57.000000000 +0700
@@ -4,6 +4,14 @@
 
 KMOD=	toecore
 SRCS=	toecore.c
-SRCS+=	opt_ofed.h
+SRCS+=	opt_inet.h opt_inet6.h opt_ofed.h
+
+.if !defined(KERNBUILDDIR)
+opt_inet.h:
+	echo "#define INET 1" >> ${.TARGET}
+
+opt_inet6.h:
+	echo "#define INET6 1" >> ${.TARGET}
+.endif
 
 .include <bsd.kmod.mk>
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pluknet 
State-Changed-When: Mon Oct 7 12:58:18 UTC 2013 
State-Changed-Why:  
Committed to stable/9, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180918 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/180918: commit references a PR
Date: Mon,  7 Oct 2013 12:57:36 +0000 (UTC)

 Author: pluknet
 Date: Mon Oct  7 12:57:27 2013
 New Revision: 256109
 URL: http://svnweb.freebsd.org/changeset/base/256109
 
 Log:
   MFC r237560,254319 (by uqs): Fix 'make depend'.
   
   PR:		misc/180918
   Submitted by:	Eugene Grosbein <egrosbein@rdtc.ru>
 
 Modified:
   stable/9/sys/modules/dtrace/sdt/Makefile
   stable/9/sys/modules/rdma/krping/Makefile
   stable/9/sys/modules/toecore/Makefile
 Directory Properties:
   stable/9/sys/   (props changed)
   stable/9/sys/modules/   (props changed)
 
 Modified: stable/9/sys/modules/dtrace/sdt/Makefile
 ==============================================================================
 --- stable/9/sys/modules/dtrace/sdt/Makefile	Mon Oct  7 12:07:40 2013	(r256108)
 +++ stable/9/sys/modules/dtrace/sdt/Makefile	Mon Oct  7 12:57:27 2013	(r256109)
 @@ -4,7 +4,7 @@
  
  KMOD=		sdt
  SRCS=		sdt.c
 -SRCS+=		vnode_if.h
 +SRCS+=		vnode_if.h opt_kdtrace.h
  
  CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
  		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
 
 Modified: stable/9/sys/modules/rdma/krping/Makefile
 ==============================================================================
 --- stable/9/sys/modules/rdma/krping/Makefile	Mon Oct  7 12:07:40 2013	(r256108)
 +++ stable/9/sys/modules/rdma/krping/Makefile	Mon Oct  7 12:57:27 2013	(r256109)
 @@ -5,8 +5,8 @@ RDMA= ${.CURDIR}/../../../contrib/rdma/k
  
  KMOD= krping
  SRCS= krping.c krping_dev.c getopt.c
 -SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h
 -SRCS+=  vnode_if.h
 -CFLAGS+= -I${.CURDIR}/../../../ofed/include 
 +SRCS+=  bus_if.h device_if.h pci_if.h pcib_if.h vnode_if.h
 +SRCS+=  opt_sched.h opt_inet.h opt_inet6.h
 +CFLAGS+= -I${.CURDIR}/../../../ofed/include
  
  .include <bsd.kmod.mk>
 
 Modified: stable/9/sys/modules/toecore/Makefile
 ==============================================================================
 --- stable/9/sys/modules/toecore/Makefile	Mon Oct  7 12:07:40 2013	(r256108)
 +++ stable/9/sys/modules/toecore/Makefile	Mon Oct  7 12:57:27 2013	(r256109)
 @@ -4,6 +4,6 @@
  
  KMOD=	toecore
  SRCS=	toecore.c
 -SRCS+=	opt_ofed.h
 +SRCS+=	opt_ofed.h opt_inet.h opt_inet6.h
  
  .include <bsd.kmod.mk>
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
