Modular TB broken: glcontextmodes.h: No such file or directory

[Donnie Berkholz]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Kevin E Martin wrote:
| Not quite sure why this is happening in the TB, but it's probably due to
| the symlink-mesa.sh script not being run.  That script is what links the
| glcontextmodes.[ch] into the xserver/xorg/GL/glx subdir.  Everything
| else looks fine.

Here's a closer look at what's happening. I looked at the tinderbox
files following a failed xorg-server build.

gcc -DHAVE_CONFIG_H -I. -I../../../../GL/mesa/X -I../../../include
- -I../../../include -I../../../include -I../../../include
- -I../../../include -I../../../include
- -I/usr/local/share/tinderbox/tinderclient/xorg/Mesa/include -I../X
- -I../array_cache -I../glapi -I../main -I../math -I../shader -I../swrast
- -I../swrast_setup -I../tnl -I.. -I../../../../GL/glx
- -I../../../../GL/include -DHAVE_DIX_CONFIG_H -DXFree86Server -include
dix-config.h -Wall -Wpointer-arith -Wstrict-prototypes
- -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
- -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
- -I/usr/local/share/tinderbox/tinderclient/xorg/prefix/include
- -I../../../../include -I../../../include -I../../../../Xext
- -I../../../../composite -I../../../../damageext -I../../../../xfixes
- -I../../../../Xi -I../../../../mi -I../../../../miext/shadow
- -I../../../../miext/damage -I../../../../render -I../../../../randr
- -I../../../../fb -I../../../../lbx
- -I/usr/local/share/tinderbox/tinderclient/xorg/prefix/include -g -O2 -c
../../../../GL/mesa/X/xf86glx.c  -fPIC -DPIC -o .libs/xf86glx.o
../../../../GL/mesa/X/xf86glx.c:72:28: glcontextmodes.h: No such file or
directory

donnie at nebula /usr/local/share/tinderbox/tinderclient/xorg/xserver/xorg
$ find ./ -name *glcontext*
./build/GL/glx/glcontextmodes.c
./build/GL/glx/glcontextmodes.h
./build/GL/glx/.deps/glcontextmodes.Plo
./build/GL/glx/.libs/glcontextmodes.o
./build/GL/glx/glcontextmodes.o
./build/GL/glx/glcontextmodes.lo

So the files are in xserver/xorg/build/GL/glx. But is that included in
the compile line?

We see "-I../../../../GL/glx" from
/usr/local/share/tinderbox/tinderclient/xorg/xserver/xorg/build/GL/mesa/X,
which ends up looking in xserver/xorg/GL/glx rather than
xserver/xorg/build/GL/glx as it should. Looks like a builddir != srcdir
problem.

Thanks,
Donnie
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDh5PSXVaO67S1rtsRAvjVAJ4kdsH0klefBG+cxZmCqJB/PDS6UQCgnyKU
JsGi3fPivq/MhbFFmV94fJA=
=0Zij
-----END PGP SIGNATURE-----