kern/154024: [zfs] broken include path in kern.pre

[Alexander Best]

>Number:         154024
>Category:       kern
>Synopsis:       [zfs] broken include path in kern.pre
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 15 10:00:23 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Best
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD otaku 9.0-CURRENT FreeBSD 9.0-CURRENT #2 r216931: Mon Jan  3 21:51:08 CET 2011     arundel at otaku:/usr/obj/usr/subversion-src/sys/ARUNDEL  amd64
>Description:
"INCLUDES+= -I$S/contrib/opensolaris/compat" points to a non-existing directory. Sergey Kandaurov noticed that this is a leftover from //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys. Warner Losh reccommended to remove the include line from kern.pre completely. the attached patch will correct the path, however: since target 'buildworld' suceeds with the broken include, Warner Losh is probably right. simply removing it won't do any harm.

the discussion took place on freebsd-hackers@ [1].

cheers.
alex

[1] http://www.mail-archive.com/freebsd-hackers@freebsd.org/msg159002.html
>How-To-Repeat:
when using "CC=clang -v" and "CXX=clang++ -v" as base compiler the problem becomes obvious. simply look for these lines:

ignoring nonexistent directory "/usr/src/sys/contrib/opensolaris/compat"
>Fix:


Patch attached with submission follows:

Index: sys/conf/kern.pre.mk
===================================================================
--- sys/conf/kern.pre.mk	(revision 217444)
+++ sys/conf/kern.pre.mk	(working copy)
@@ -83,7 +83,7 @@
 INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs
 
 # ...  and OpenSolaris
-INCLUDES+= -I$S/contrib/opensolaris/compat
+INCLUDES+= -I$S/cddl/compat/opensolaris
 
 # ... and the same for cxgb
 INCLUDES+= -I$S/dev/cxgb


>Release-Note:
>Audit-Trail:
>Unformatted: