debian/changelog | 2 ++
debian/scripts/choose-configs | 14 +-------------
2 files changed, 3 insertions(+), 13 deletions(-)
New commits:
commit d8a46eb12f1692503ec2277631f443627eda5193
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Jun 29 17:48:21 2010 +0100
debian/scripts/choose-configs: use DEB_HOST_ARCH, not DEB_BUILD_ARCH
(closes: #451648).
diff --git a/debian/changelog b/debian/changelog
index e2dd9fc..aa3c2ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ mesa (7.8.2-1) UNRELEASED; urgency=low
* Refresh patches.
* Stop shipping an upstream git log, it's unlikely to be useful to anyone,
and it's big.
+ * debian/scripts/choose-configs: use DEB_HOST_ARCH, not DEB_BUILD_ARCH
+ (closes: #451648).
[ Christopher James Halse Rogers ]
* debian/patches/07-nouveau-update.diff:
diff --git a/debian/scripts/choose-configs b/debian/scripts/choose-configs
index b7d68e2..b460eee 100644
--- a/debian/scripts/choose-configs
+++ b/debian/scripts/choose-configs
@@ -23,23 +23,11 @@
SWX11_GLU_CONFIGS := swx11+glu swx11+glu-static
-# and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-indirect-$(DEB_BUILD_ARCH)),)
- DRI_CONFIGS := debian-indirect-$(DEB_BUILD_ARCH)
-else
- ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
- DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
- else
- DRI_CONFIGS := debian-dri-any
- endif
-endif
-
##############################################################################
## CPU-optimized configurations ##############################################
-ifneq (,$(filter $(DEB_BUILD_ARCH), i386 kfreebsd-i386 hurd-i386))
+ifneq (,$(filter $(DEB_HOST_ARCH), i386 kfreebsd-i386 hurd-i386))
SWX11_GLU_CONFIGS += swx11+glu-i386-i686
-# DRI_CONFIGS += debian-dri-i386-i686
endif
#ifeq ($(DEB_BUILD_ARCH), alpha)
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1otdzp-0005pu...@alioth.debian.org
