Fix build on hurd-i386.

Build libgl1-mesa-glx without direct rendering support on that arch, and
don't build any dri driver.

5 files changed, 27 insertions, 5 deletions

diff --git a/configs/debian-indirect-default b/configs/debian-indirect-default
new file mode 100644
index 00000000000..a6926c95fcc
--- /dev/null
+++ b/configs/debian-indirect-default
@@ -0,0 +1,7 @@
+# Configuration defaults for building GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-indirect-default
+
+DRI_DIRS = 
diff --git a/configs/debian-indirect-hurd-i386 b/configs/debian-indirect-hurd-i386
new file mode 100644
index 00000000000..dd4bb07ca52
--- /dev/null
+++ b/configs/debian-indirect-hurd-i386
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-indirect
+include $(TOP)/configs/debian-indirect-default
+
+CONFIG_NAME = debian-indirect-hurd-i386
+
+# vim: ft=make
+
diff --git a/debian/changelog b/debian/changelog
index b5973776bf3..5e71fec1d13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ mesa (6.5.2-6) UNRELEASED; urgency=low
     it used to contain libOSMesa.so.6.  This means that programs linked
     against this lib got a dependency on -swx11 which was broken since
     6.5.2-1.
+  * Fix build on hurd-i386 (build libgl1-mesa-glx without dri support and
+    don't build the dri drivers); closes: #420403.  Thanks, Samuel Thibault!
 
- -- Julien Cristau <jcristau@debian.org>  Tue, 03 Jul 2007 05:28:37 +0200
+ -- Julien Cristau <jcristau@debian.org>  Thu, 05 Jul 2007 00:47:14 +0200
 
 mesa (6.5.2-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ae265c850a5..83e59078cd4 100644
--- a/debian/control
+++ b/debian/control
@@ -158,7 +158,7 @@ Description: A free implementation of the OpenGL API -- GLX runtime -- debugging
 Package: libgl1-mesa-dri
 Section: libs
 Priority: optional
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
 Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
 Suggests: libglide3
 Conflicts: xlibmesa-dri (<< 1:7.0.0)
@@ -179,7 +179,7 @@ Description: A free implementation of the OpenGL API -- DRI modules
 Package: libgl1-mesa-dri-dbg
 Section: libdevel
 Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
 Depends: libgl1-mesa-dri (= ${binary:Version})
 Description: A free implementation of the OpenGL API -- DRI modules -- debugging symbols
  This version of Mesa provides GLX and DRI capabilities: it is capable of
diff --git a/debian/scripts/choose-configs b/debian/scripts/choose-configs
index 3f5f9868e51..16e00828a76 100644
--- a/debian/scripts/choose-configs
+++ b/debian/scripts/choose-configs
@@ -22,10 +22,14 @@ else
 endif
 
 # and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
-	DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+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
 
 ##############################################################################