mesa: Changes to 'ubuntu'
debian/changelog | 2 ++
debian/rules | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit fa2de354fe2df63c87fe03341ba5c34668aecd96
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Sun Mar 27 23:12:26 2011 -0700
The architecture we're building for is DEB_HOST_ARCH, not DEB_BUILD_ARCH.
diff --git a/debian/changelog b/debian/changelog
index 6d1279c..4230423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mesa (7.10.1-0ubuntu4) UNRELEASED; urgency=low
[ Steve Langasek ]
* Fix alternatives removal on removal of libgl1-mesa-{swx11,glx}: the
files are in /usr/lib/mesa, not /usr/lib/GL.
+ * The architecture we're building for is DEB_HOST_ARCH, not
+ DEB_BUILD_ARCH.
-- Robert Hooker <sarvatt@ubuntu.com> Wed, 23 Mar 2011 15:51:12 -0400
diff --git a/debian/rules b/debian/rules
index e89e053..b0c7dc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -185,7 +185,7 @@ confflags-swx11+glu-i386-i686 = \
# for 32 bit compatibility on 64 bit systems
#
# Add /usr/lib/dri-alternates for classic fallback for gallium drivers
-ifeq ($(DEB_BUILD_ARCH),i386)
+ifeq ($(DEB_HOST_ARCH),i386)
confflags-dri += --with-dri-searchpath=/usr/lib/dri:/usr/lib/dri-alternates:/usr/lib32/dri:/usr/lib32/dri-alternates
else
confflags-dri += --with-dri-searchpath=/usr/lib/dri:/usr/lib/dri-alternates
@@ -284,7 +284,7 @@ binary-arch: install
echo "/usr/lib/mesa" \
> $(CURDIR)/debian/libgl1-mesa-swx11/usr/lib/mesa/ld.so.conf
-ifeq ($(DEB_BUILD_ARCH),amd64)
+ifeq ($(DEB_HOST_ARCH),amd64)
# Add the path to 32bit libGL from Mesa (on 64 bit)
echo "/usr/lib32/mesa" \
>> $(CURDIR)/debian/libgl1-mesa-glx/usr/lib/mesa/ld.so.conf
Reply to: