diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-09-20 22:10:31 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-09-20 22:10:31 +0000 |
| commit | 7bfa50d3694803c67ba7c19bb2068055ce13aa16 (patch) | |
| tree | a9202b220a0c17472d951178e3276d961238e655 /x11-base | |
| parent | Stable on x86, bug #148318. (diff) | |
| download | gentoo-2-7bfa50d3694803c67ba7c19bb2068055ce13aa16.tar.gz gentoo-2-7bfa50d3694803c67ba7c19bb2068055ce13aa16.tar.bz2 gentoo-2-7bfa50d3694803c67ba7c19bb2068055ce13aa16.zip | |
Base ifdef on __sparc__ rather than __sparc64__. The issue happens on 64-bit kernel/32-bit userland, so sparc64 isn't defined when building the userland.
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 0c74887fe2fc..8d13a27a1a3f 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.171 2006/09/20 17:24:28 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.172 2006/09/20 22:10:31 dberkholz Exp $ + + 20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + files/1.1.1-sparc64-ati-lockups.patch: + Base ifdef on __sparc__ rather than __sparc64__. The issue happens on 64-bit + kernel/32-bit userland, so sparc64 isn't defined when building the userland. 20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; xorg-server-1.1.1-r1.ebuild: diff --git a/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch b/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch index ba19b239a83b..d44d9699b2d7 100644 --- a/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch +++ b/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch @@ -8,7 +8,7 @@ index a3c07f3..a97e6f0 100644 /* pciAddrHostToBus */ pciAddrNOOP, +/* linuxTransAddrBusToHost is busted on sparc64 but the PCI rework tree + * makes it all moot, so we kludge it for now */ -+#if defined(__sparc64__) ++#if defined(__sparc__) +/* pciAddrBusToHost */ pciAddrNOOP, +#else /* pciAddrBusToHost */ linuxTransAddrBusToHost, |