Re: building netbsd-5's X w/ a case-independent file system

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

On Thu, 19 Mar 2009, Hubert Feyrer wrote:
> I'm getting build errors[1] on NetBSD 5.0 that are caused by a Mac NFS 
> server, which can't tell the difference between XKBMisc.lo and xkbmisc.lo.

Below's a fix.

Affected files:
 * xsrc/external/mit/libxkbfile/dist/src/xkbfile-xkbmisc.c (new)
 * src/external/mit/xorg/tools/xkbcomp/Makefile (patch)

Tested on netbsd-5 w/ NFS from a Mac OS X machine.

Comments?


 - Hubert



New file: xsrc-5/external/mit/libxkbfile/dist/src:
<snip>
/*      $NetBSD: xkbfile-xkbmisc.c,v 1.1 2006/09/11 22:13:51 dbj Exp $  */

/* This file exists to differentiate between
 * lib/xkbfile/xkbmisc.c and lib/X11/XKBMisc.c
 * which causes objdir conflicts on case-insensitive filesystems
 */

#include "xkbmisc.c"
</snip>


Index: Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/tools/xkbcomp/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile    29 Jul 2008 05:01:22 -0000      1.1.1.1
+++ Makefile    29 Mar 2009 04:04:08 -0000
@@ -16,7 +16,7 @@
 SRCS+=         xkbcomp-stubs.c xkbcomp-KeyBind.c

 .PATH:         ${X11SRCDIR.xkbfile}/src
-SRCS+=         xkbatom.c xkberrs.c xkbmisc.c xkbout.c xkmread.c xkbtext.c \
+SRCS+=         xkbatom.c xkberrs.c xkbfile-xkbmisc.c xkbout.c xkmread.c 
xkbtext.c \
                cout.c xkmout.c

 .PATH:         ${X11SRCDIR.X11}/src/xkb