Date: Sat, 26 May 2001 00:34:47 -0700 From: Doug Barton <DougB@DougBarton.net> To: Warner Losh <imp@harmony.village.org> Cc: Ruslan Ermilov <ru@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/amd/include am_defs.h src/usr.sbin/amd/includeconfig.h src/etc/mtree BSD.include.dist src/include Makefilesrc/sbin/mount_msdos mount_msdos.c src/sbin/mountd mountd.csrc/share/man/man7 hier.7 src/sys/boot/forth loader.conf ... Message-ID: <3B0F5C97.339728E8@DougBarton.net> References: <3B0F3084.8CBB0277@DougBarton.net> <200105250814.f4P8EFU71641@freefall.freebsd.org> <200105260632.f4Q6WDE67125@harmony.village.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Warner Losh wrote:
>
> In message <3B0F3084.8CBB0277@DougBarton.net> Doug Barton writes:
> : This is a multi-part message in MIME format.
> : --------------1E126C336F3C01227467EEA4
> : Content-Type: text/plain; charset=us-ascii
> : Content-Transfer-Encoding: 7bit
> :
> : The amd part of this commit broke world for me because I didn't have
> : /usr/include/fs/msdosfs/* The attached patch fixed it for me, but it's
> : probably wrong for some reason. :)
>
> We're trying to get rid of these things (including the kernel headers
> in the include file includes).
Yeah, like I said, I was sure that'd be wrong somehow.
> Likely it is a problem in make
> includes in sys/Makefile. They should be installed into the temp root
> that we compile against.
Do you mean src/Makefile.inc? I can't find anything like that in
sys/Makefile. I also can't quite make out how we'd get
/usr/src/sys/fs/msdosfs/msdosfsmount.h put into the temp root you describe
using the mechanism in src/Makefile.inc, so at this point I give up. :)
I've attached the patch that did the damage, FYI.
It sounds like a good project for someone who's bored would be to move
/usr/include out of the way and start a buildworld, fixing things as you go
along.
--
I need someone really bad. Are you really bad?
[-- Attachment #2 --]
===================================================================
RCS file: /home/ncvs/src/contrib/amd/include/am_defs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- src/contrib/amd/include/am_defs.h 1999/11/05 11:58:03 1.8
+++ src/contrib/amd/include/am_defs.h 2001/05/25 08:13:55 1.9
@@ -39,7 +39,7 @@
* %W% (Berkeley) %G%
*
* $Id: am_defs.h,v 1.11 1999/09/18 08:38:05 ezk Exp $
- * $FreeBSD: /home/ncvs/src/contrib/amd/include/am_defs.h,v 1.8 1999/11/05 11:58:03 obrien Exp $
+ * $FreeBSD: /home/ncvs/src/contrib/amd/include/am_defs.h,v 1.9 2001/05/25 08:13:55 ru Exp $
*
*/
@@ -743,7 +743,11 @@ struct sockaddr_dl;
*/
#ifdef HAVE_MSDOSFS_MSDOSFSMOUNT_H
# include <msdosfs/msdosfsmount.h>
-#endif /* HAVE_MSDOSFS_MSDOSFSMOUNT_H */
+#else /* not HAVE_MSDOSFS_MSDOSFSMOUNT_H */
+# ifdef HAVE_FS_MSDOSFS_MSDOSFSMOUNT_H
+# include <fs/msdosfs/msdosfsmount.h>
+# endif /* HAVE_FS_MSDOSFS_MSDOSFSMOUNT_H */
+#endif /* not HAVE_MSDOSFS_MSDOSFSMOUNT_H */
/*
* Actions to take if <sys/fs/tmp.h> exists.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3B0F5C97.339728E8>