Re: 16_s390_fix.diff makes xorg-xserver fail to build on PowerPC

[David Nusinow <david_nusinow@verizon.net>]

On Sun, Aug 27, 2006 at 11:06:01PM +0300, Daniel Stone wrote:
> On Sun, Aug 27, 2006 at 08:33:09PM +0200, Yannick Roehlly wrote:
> > I've been trying the experimental packages on my ibook and I noticed that the 
> > 16_s390_fix.diff makes xorg-xserver fail to build on my machine.
> > 
> > v 1:1.1.1-2 was building.
> > v 2:1.1.1-4 was not
> > v 2:1.1.1-4 without 16_s390_fix.diff was.
> > 
> > You'll find attached the last lines of the compilation where the error occurs.
> 
> > ../../../../../hw/xfree86/os-support/linux/lnx_video.c:652: undefined reference to `iopl'
> > ../../../../../hw/xfree86/os-support/linux/lnx_video.c:652: undefined reference to `ioperm'
> 
> Here's the problem:
> -#if !defined(__mc68000__) && !defined(__powerpc__) && [...] && !defined(__arm__)
> +#if !defined(__mc68000__) && !defined(__powerpc__) && [...] && !defined(__arm__) || !defined(__s390__)
> 
> The || at the end should be &&.  The rest of this patch seems correct,
> however.

Thanks both of you. Fix committed. I'll upload the new version tonight.

 - David Nusinow