From bec45fd10ac12b0bad88dcd52585c087a721663b Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 25 Nov 2010 10:56:47 +0000
Subject: main/mesa: x86_64 build fix. need secial case for sis too

based on nenolods patch
---
 main/mesa/APKBUILD | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'main/mesa')

diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index d38a2cd1d..34cba8682 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev
 	$pkgname-dri-mga:mga
 	$pkgname-dri-r128:r128
 	$pkgname-dri-savage:savage
-	$pkgname-dri-sis:sis
 	$pkgname-dri-swrast:swrast
 	$pkgname-dri-tdfx:tdfx
 	$pkgname-dri-unichrome:unichrome
@@ -32,6 +31,16 @@ _dri_driverdir=/usr/lib/xorg/modules/dri
 
 _builddir="$srcdir/Mesa-$pkgver"
 
+case "$CHOST" in
+x86_64-*)
+	_intel_dri="i915_dri i965_dri"
+	;;
+i[3456789]86-*)
+	_intel_dri="i810_dri i915_dri i965_dri"
+	subpackages="$subpackages $pkgname-dri-sis:sis"
+	;;
+esac
+
 prepare() { 
 	cd "$_builddir"
 	for i in ../*.patch; do
@@ -78,14 +87,7 @@ _mv_dri() {
 }
 
 ati() {		_mv_dri radeon_dri r200_dri r300_dri r600_dri; }
-intel() {
-	# there are no i810_dri for x86_64
-	local _i810=
-	if [ "$CARCH" != "x86_64" ]; then
-		_i810=i810_dri
-	fi
-	_mv_dri $_i810 i915_dri i965_dri;
-}
+intel() {	_mv_dri $_intel_dri; }
 mach64() {	_mv_dri mach64_dri; }
 mga() {		_mv_dri mga_dri; }
 r128() {	_mv_dri r128_dri; }
-- 
cgit v1.2.3