Bug#358065: mesa: FTBFS on hurd-i386 because of dri/drm

[Michael Banck]

tags 358065 +patch
thanks

Hi,

the attached patch fixes this problem in the most elegant way I could
come up with given the make-me-harder attitude of mesa's debian/rules.
If somebody has a better suggestion, I'd be happy to know :)

As the current version has reached testing some time ago, and a missing
mesa seems to be breaking a lot, I plan to NMU this in a couple of days
if there are no objections.


cheers,

Michael
-------------- next part --------------
diff -u mesa-6.4.1/debian/control mesa-6.4.1/debian/control
--- mesa-6.4.1/debian/control
+++ mesa-6.4.1/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Mesa package maintainers <pkg-mesa-devel at lists.alioth.debian.org>
 Uploaders: Marcelo E. Magallon <mmagallo at debian.org>
 Standards-Version: 3.6.1
-Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>> 1.0.5), libdirectfb-dev, xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, 
+Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>> 1.0.5) [!hurd-i386], libdirectfb-dev, xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, 
 
 Package: libgl1-mesa-swx11
 Section: libs
diff -u mesa-6.4.1/debian/rules mesa-6.4.1/debian/rules
--- mesa-6.4.1/debian/rules
+++ mesa-6.4.1/debian/rules
@@ -17,7 +17,11 @@
 
 STAMPDIR := debian/stamp
 
+ifeq (hurd-i386,$(DEB_HOST_ARCH))
+select_target_any = $(shell dh_listpackages -s | grep -v '^$$' | while read p ; do cut -d ' ' -f 1,3 debian/libdir.map | grep -w $$p ; done | grep -v _ | grep -v dri | cut -d ' ' -f 1 | sort -u | grep ^$(1)- | cut -d - -f 2-)
+else
 select_target_any = $(shell dh_listpackages -s | grep -v '^$$' | while read p ; do cut -d ' ' -f 1,3 debian/libdir.map | grep -w $$p ; done | grep -v _ | cut -d ' ' -f 1 | sort -u | grep ^$(1)- | cut -d - -f 2-)
+endif
 select_target_arch = $(filter $(foreach t,$(BUILD_$(1)_TARGETS_any),$(t)_%), $(patsubst configs/%, %, $(wildcard configs/*_$(DEB_HOST_ARCH))))
 select_target = $(sort $(BUILD_$(1)_TARGETS_any) $(BUILD_$(1)_TARGETS_arch))