diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2007-02-17 15:54:26 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2007-02-17 15:54:26 +0000 |
| commit | 037d5cb5f21f178f5169fcc369aa74d2e85622fc (patch) | |
| tree | 6806c431581d5564257c6640438ac3541a59f994 /media-libs | |
| parent | Version bump (diff) | |
| download | gentoo-2-037d5cb5f21f178f5169fcc369aa74d2e85622fc.tar.gz gentoo-2-037d5cb5f21f178f5169fcc369aa74d2e85622fc.tar.bz2 gentoo-2-037d5cb5f21f178f5169fcc369aa74d2e85622fc.zip | |
set CONFIG depending on ABI on amd64; bug 125125
(Portage version: 2.1.2-r9)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mesa/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.5.1-r1.ebuild | 9 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.5.2.ebuild | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 99b7925c1f9b..e867c82f46d0 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.135 2007/01/24 07:15:44 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.136 2007/02/17 15:54:26 blubb Exp $ + + 17 Feb 2007; Simon Stelling <blubb@gentoo.org> mesa-6.5.1-r1.ebuild, + mesa-6.5.2.ebuild: + set CONFIG depending on ABI on amd64; bug 125125 24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>; -files/64bit-fix-have-dix-config.patch, diff --git a/media-libs/mesa/mesa-6.5.1-r1.ebuild b/media-libs/mesa/mesa-6.5.1-r1.ebuild index 0630180c8573..f2d4baa880ea 100644 --- a/media-libs/mesa/mesa-6.5.1-r1.ebuild +++ b/media-libs/mesa/mesa-6.5.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.10 2006/12/01 18:16:05 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.11 2007/02/17 15:54:26 blubb Exp $ inherit eutils toolchain-funcs multilib flag-o-matic portability @@ -83,10 +83,11 @@ pkg_setup() { CONFIG="freebsd-dri-amd64" elif use kernel_FreeBSD; then CONFIG="freebsd-dri" - elif use x86; then + elif use x86 ; then CONFIG="linux-dri-x86" elif use amd64; then - CONFIG="linux-dri-x86-64" + [[ ${ABI} -eq "amd64" ]] && CONFIG="linux-dri-x86-64" + [[ ${ABI} -eq "x86" ]] && CONFIG="linux-dri-x86" elif use ppc; then CONFIG="linux-dri-ppc" else diff --git a/media-libs/mesa/mesa-6.5.2.ebuild b/media-libs/mesa/mesa-6.5.2.ebuild index 1c50f5772cc1..dcd34220f528 100644 --- a/media-libs/mesa/mesa-6.5.2.ebuild +++ b/media-libs/mesa/mesa-6.5.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.2 2006/12/08 05:02:30 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.3 2007/02/17 15:54:26 blubb Exp $ inherit eutils toolchain-funcs multilib flag-o-matic portability @@ -88,7 +88,8 @@ pkg_setup() { elif use x86; then CONFIG="linux-dri-x86" elif use amd64; then - CONFIG="linux-dri-x86-64" + [[ ${ABI} -eq "amd64" ]] && CONFIG="linux-dri-x86-64" + [[ ${ABI} -eq "x86" ]] && CONFIG="linux-dri-x86" elif use ppc; then CONFIG="linux-dri-ppc" else |