Package: src:mesa Version: 10.2.4-1 Tags: patch please fix the mesa build on x32 (assuming that llvm isn't yet buildable).
diff -u mesa-10.2.4/debian/changelog mesa-10.2.4/debian/changelog --- mesa-10.2.4/debian/changelog +++ mesa-10.2.4/debian/changelog @@ -1,3 +1,10 @@ +mesa (10.2.4-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * x32 fixes. + + -- Matthias Klose <[email protected]> Sun, 10 Aug 2014 19:19:58 +0200 + mesa (10.2.4-1) unstable; urgency=medium * New upstream release. diff -u mesa-10.2.4/debian/patches/series mesa-10.2.4/debian/patches/series --- mesa-10.2.4/debian/patches/series +++ mesa-10.2.4/debian/patches/series @@ -1,0 +2 @@ +x32-updates.diff diff -u mesa-10.2.4/debian/rules mesa-10.2.4/debian/rules --- mesa-10.2.4/debian/rules +++ mesa-10.2.4/debian/rules @@ -23,6 +23,8 @@ confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif +use_llvm = $(filter $(DEB_HOST_ARCH), amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf) + ifeq (,$(filter $(DEB_HOST_ARCH), armhf)) buildflags = \ $(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure) @@ -200,7 +202,7 @@ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --localstatedir=/var --disable-silent-rules \ $(confflags) $(confflags-$*) \ - ac_cv_path_LLVM_CONFIG=llvm-config-3.4 + $(if $(use_llvm), ac_cv_path_LLVM_CONFIG=llvm-config-3.4) cd $(DEB_BUILD_DIR)/$* && $(MAKE) >$@ only in patch2: unchanged: --- 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
