Bug#757703: fix mesa build on x32

[Matthias Klose <doko@debian.org>]

Am 11.08.2014 um 15:23 schrieb Julien Cristau:
> On Mon, Aug 11, 2014 at 15:18:11 +0200, Matthias Klose wrote:
> 
>> Am 11.08.2014 um 15:13 schrieb Julien Cristau:
>>> Control: tags -1 moreinfo
>>>
>>> On Sun, Aug 10, 2014 at 19:36:30 +0200, Matthias Klose wrote:
>>>
>>>> --- mesa-10.2.4.orig/debian/patches/x32-updates.diff
>>>> +++ mesa-10.2.4/debian/patches/x32-updates.diff
>>>> @@ -0,0 +1,12 @@
>>>> +Index: b/configure.ac
>>>> +===================================================================
>>>> +--- a/configure.ac
>>>> ++++ b/configure.ac
>>>> +@@ -1757,6 +1757,7 @@ gallium_check_st() {
>>>> + 
>>>> + gallium_require_llvm() {
>>>> +     if test "x$MESA_LLVM" = x0; then
>>>> ++        case "$host" in *gnux32) return;; esac
>>>> +         case "$host_cpu" in
>>>> +         i*86|x86_64|amd64) AC_MSG_ERROR([LLVM is required to build $1 on x86 and x86_64]);;
>>>> +         esac
>>>
>>> Why shouldn't this apply to x32 the same way it does to x86 and x86_64?
>>
>> because there is no llvm build on x32.
> 
> then maybe x32 shouldn't build the r300 driver until it gets llvm.

why is this driver built for other architectures not having llvm?

sure, feel free to disable it.

>>  afaics you build the gallium and noveau
>> drivers for any architecture except s390 and s390x. why?
>> why are s390 and s390x handled this way? maybe add m68k too, so that the package
>> builds there too?
>>
> s390 and s390x are unlikely to need those hardware drivers afaik.  I
> have no idea about m68k.

if you have no idea, why do you even try to build it? Attached is a patch, I
didn't try to build it, but afaics this shouldn't cause any harm.

  Matthias


--- debian/rules~	2014-08-11 15:27:43.000000000 +0200
+++ debian/rules	2014-08-11 15:35:56.332758832 +0200
@@ -84,7 +84,7 @@
 	EGL_DISPLAYS += drm
 # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
 	EGL_DISPLAYS += wayland
-    ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
+    ifeq (,$(filter $(DEB_HOST_ARCH), m68k s390 s390x))
 	DRI_DRIVERS += nouveau
     endif
   endif
@@ -101,7 +101,7 @@
 	DRI_DRIVERS += swrast
   endif
 
-  ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
+  ifeq (,$(filter $(DEB_HOST_ARCH), m68k s390 s390x))
     DRI_DRIVERS += r200 radeon
     GALLIUM_DRIVERS += r600 r300
   endif