[X2Go-Dev] Bug#411: Fix ppc64 build

[Orion Poplawski]

Package: nx-libs
Version: 3.5.0.22
Tags: patch

Apparently gcc on EL7 pcc64 defines a macro named "pixel".  This breaks imake:

make[7]: Entering directory
`/builddir/build/BUILD/nx-libs-3.5.0.22/nx-X11/programs/Xserver/GL/mesa'
making Makefiles in programs/Xserver/GL/mesa/main...
make[8]: Entering directory
`/builddir/build/BUILD/nx-libs-3.5.0.22/nx-X11/programs/Xserver/GL/mesa'
In file included from ../../../../../config/cf/Imake.tmpl:2158:0,
                 from Imakefile.c:36:
../../../../../config/cf/X11.tmpl:1704:0: warning:
"UseInstalledOnCrossCompile" is not defined [-Wundef]
 # elif UseInstalledOnCrossCompile
 ^
In file included from ./Imakefile:25:0,
                 from ../../../../../config/cf/Imake.tmpl:2194,
                 from Imakefile.c:36:
./../../../../../lib/GL/mesa/main/Imakefile.inc:59:0: error: detected
recursion whilst expanding macro "pixel"
   $(MESABUILDDIR)pixel.c \
 ^
./../../../../../lib/GL/mesa/main/Imakefile.inc:168:0: error: detected
recursion whilst expanding macro "pixel"
 LinkSourceFile(pixel.c, $(MESASRCDIR)/src/mesa/main)
 ^
./../../../../../lib/GL/mesa/main/Imakefile.inc:168:0: error: detected
recursion whilst expanding macro "pixel"
./../../../../../lib/GL/mesa/main/Imakefile.inc:168:0: error: detected
recursion whilst expanding macro "pixel"
./../../../../../lib/GL/mesa/main/Imakefile.inc:168:0: error: detected
recursion whilst expanding macro "pixel"
./../../../../../lib/GL/mesa/main/Imakefile.inc:168:0: error: detected
recursion whilst expanding macro "pixel"
./../../../../../lib/GL/mesa/main/Imakefile.inc:169:0: error: detected
recursion whilst expanding macro "pixel"
 LinkSourceFile(pixel.h, $(MESASRCDIR)/src/mesa/main)
 ^
./../../../../../lib/GL/mesa/main/Imakefile.inc:169:0: error: detected
recursion whilst expanding macro "pixel"
./../../../../../lib/GL/mesa/main/Imakefile.inc:169:0: error: detected
recursion whilst expanding macro "pixel"
./../../../../../lib/GL/mesa/main/Imakefile.inc:169:0: error: detected
recursion whilst expanding macro "pixel"
./../../../../../lib/GL/mesa/main/Imakefile.inc:169:0: error: detected
recursion whilst expanding macro "pixel"
./../../../../../lib/GL/mesa/main/Imakefile.inc:258:0: error: detected
recursion whilst expanding macro "pixel"
   $(MESABUILDDIR)pixel.o \
 ^
./../../../../../lib/GL/mesa/main/Imakefile.inc:398:0: error: detected
recursion whilst expanding macro "pixel"
   $(MESABUILDDIR)debugger/pixel.o \
 ^
./../../../../../lib/GL/mesa/main/Imakefile.inc:466:0: error: detected
recursion whilst expanding macro "pixel"
   $(MESABUILDDIR)profiled/pixel.o \
 ^
make[8]: Leaving directory
`/builddir/build/BUILD/nx-libs-3.5.0.22/nx-X11/programs/Xserver/GL/mesa'
make[7]: Leaving directory
`/builddir/build/BUILD/nx-libs-3.5.0.22/nx-X11/programs/Xserver/GL/mesa'
../../../../../config/imake/imake: Exit code 1.
  Stop.
make[8]: *** [main/Makefile] Error 1

The attached patch fixes.  There might be a better place to undefine the
macro, but this works.

-- 
Orion Poplawski
Technical Manager                     303-415-9701 x222
NWRA, Boulder/CoRA Office             FAX: 303-415-9702
3380 Mitchell Lane                       orion at nwra.com
Boulder, CO 80301                   http://www.nwra.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: nx-libs-ppc64.patch
Type: text/x-patch
Size: 570 bytes
Desc: not available
URL: <http://lists.x2go.org/pipermail/x2go-dev/attachments/20140124/f8610675/attachment.bin>