Re: Building -current/netbsd-5 on Solaris: warning for tools/file

[Hubert Feyrer <hubert%feyrer.de@localhost>]

[adding christos@ as file maintainer to CC:]


On Tue, 4 Nov 2008, Luke Mewburn wrote:
> I'll attempt to get a test system up & running to reproduce
> the problem you're seeing, and I may even be able to generate
> some fixes to feed "upstream" back to Christos.  (Unless
> you or Christos beat me to the punch :)

Comparing NetBSD's in-tree version and the latest file version (4.26), 
I've reduced the diffs to the one below, which fixes things for me.
It gets things going on Solaris, and doesn't seem to do any harm when 
building netbsd-5 on Linux, Mac OS and NetBSD.

No, I don't think this kind of patches should happen, but it *does* fix 
the situation.

Do I want to commit this? Christos?


 - Hubert


diff -ru /usr/homes/feyrer/cvs/src-5/dist/file/src/apprentice.c 
../file-4.26/src/apprentice.c
--- /usr/homes/feyrer/cvs/src-5/dist/file/src/apprentice.c      Sun Aug 31 
09:53:33 2008
+++ ../file-4.26/src/apprentice.c       Sat Jul 26 17:03:55 2008
@@ -30,11 +28,9 @@
 /*
  * apprentice - make one pass through /etc/magic, learning its secrets.
  */
-#include <sys/param.h>

 #include "file.h"
 #include "magic.h"
-
 #include "patchlevel.h"
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -45,6 +41,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 #ifdef QUICK
 #include <sys/mman.h>
 #endif