Re: xrdb preprocessing

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

On Tue, Dec 01, 2009 at 01:56:28PM +0000, Patrick Welche wrote:
> On Tue, Dec 01, 2009 at 01:03:55PM +0000, Patrick Welche wrote:
> > I just upgraded a laptop to the -current/i386 xorg, and for some reason
> > preprocessing doesn't seem to happen when loading xrdb resources any more.
> > 
> > (xrdb -symbols lists all the relevant variables, but the #ifdefs in
> > /etc/X11/xdm/Xresources behave as comments so there are warnings about
> > e.g. xlogin*greetFont being defined twice)
> > 
> >   http://bugs.archlinux.org/task/16957?opened=3611&status[0]=
> > 
> > looks relevant, but I haven't taken it further...
> 
> It boils down to access(2) receiving "cpp -traditional" as the file to
> check for X_OK. Trying to get the flag in will be "interesting"...

In fact, dropping the flag and adding the path works, so there aren't
too many ! in the resource files. (unifdef didn't work for me), so
trivial attached patch works...

Cheers,

Patrick

P.S., why the XXX?

Index: Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/xrdb/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    2 Dec 2009 10:56:16 -0000
@@ -4,7 +4,7 @@
 
 PROG=  xrdb
 
-CPPFLAGS+=-DCPP="\"cpp -traditional\"" -DHAS_MKSTEMP   # XXX
+CPPFLAGS+=-DCPP="\"/usr/bin/cpp\"" -DHAS_MKSTEMP       # XXX
 
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}