X2Go Bug report logs - #411
Fix ppc64 build

Full log

Message #5 received at submit@bugs.x2go.org (full text, mbox, reply):

Received: (at submit) by bugs.x2go.org; 24 Jan 2014 19:10:22 +0000
From orion@cora.nwra.com  Fri Jan 24 20:10:20 2014
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
	ymir.das-netzwerkteam.de
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID
	autolearn=ham version=3.3.2
Received: from mail.cora.nwra.com (mercury.cora.nwra.com [4.28.99.165])
	by ymir (Postfix) with ESMTPS id 30D045DA79
	for <submit@bugs.x2go.org>; Fri, 24 Jan 2014 20:10:20 +0100 (CET)
Received: from [10.10.20.7] (barry.cora.nwra.com [10.10.20.7])
	(authenticated bits=0)
	by mail.cora.nwra.com (8.14.4/8.14.4) with ESMTP id s0OJAHXB016623
	(version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO)
	for <submit@bugs.x2go.org>; Fri, 24 Jan 2014 12:10:17 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cora.nwra.com;
	s=default; t=1390590618;
	bh=WkJhmJ/wZaiDD8HERwgZ9x24x/kBqLcsVA9Q6RHr4YY=;
	h=Message-ID:Date:From:MIME-Version:To:Subject:Content-Type;
	b=pa6TQUOgD6rT7LwSksDqWR+xbBoaflbddBZuCJqjIP/w+BRGdV7KMN2PVNkU81+wg
	 ShEIsZ9E6e9yHMXGRReKYEPd+3wluWRtkB6WAzewSwJDxTfH7vngXmLpgsxOkiq5xv
	 T6z4dvSYIcfpSLMpp4qrdcYOxJeLi22bYFSeSJVw=
Message-ID: <52E2BA99.6050500@cora.nwra.com>
Date: Fri, 24 Jan 2014 12:10:17 -0700
From: Orion Poplawski <orion@cora.nwra.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0
MIME-Version: 1.0
To: submit@bugs.x2go.org
Subject: Fix ppc64 build
X-Enigmail-Version: 1.6
Content-Type: multipart/mixed;
 boundary="------------080600080706020709080500"

[Message part 1 (text/plain, inline)]

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@nwra.com
Boulder, CO 80301                   http://www.nwra.com

[nx-libs-ppc64.patch (text/x-patch, attachment)]

Send a report that this bug log contains spam.