debian/changelog | 7 +++++++ debian/patches/07_sparc64_xform_asm.patch | 11 +++++++++++ debian/patches/series | 1 + debian/rules | 2 ++ 4 files changed, 21 insertions(+)
New commits: commit ac180fa6a7510d4539b9b7a58be51b243b8c3651 Author: Brice Goglin <[email protected]> Date: Fri Dec 11 07:52:39 2009 +0100 fix sparc64 FTBFS diff --git a/debian/changelog b/debian/changelog index f9d40e7..d918f03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (7.6.1~rc2-2) UNRELEASED; urgency=low + + * Update debian/rules and add 07_sparc64_xform_asm.patch to + fix sparc64 FTBFS, thanks Aurelien Jarno, closes: #560403. + + -- Brice Goglin <[email protected]> Fri, 11 Dec 2009 07:51:52 +0100 + mesa (7.6.1~rc2-1) unstable; urgency=low * New upstream release candidate. diff --git a/debian/patches/07_sparc64_xform_asm.patch b/debian/patches/07_sparc64_xform_asm.patch new file mode 100644 index 0000000..1c00c02 --- /dev/null +++ b/debian/patches/07_sparc64_xform_asm.patch @@ -0,0 +1,11 @@ +--- mesa-7.6.1~rc2.orig/src/mesa/sparc/xform.S ++++ mesa-7.6.1~rc2/src/mesa/sparc/xform.S +@@ -17,7 +17,7 @@ + + #include "sparc_matrix.h" + +-#if defined(SVR4) || defined(__SVR4) || defined(__svr4__) ++#if defined(SVR4) || defined(__SVR4) || defined(__svr4__) || defined(__arch64__) + /* Solaris requires this for 64-bit. */ + .register %g2, #scratch + .register %g3, #scratch diff --git a/debian/patches/series b/debian/patches/series index 1f29aca..9d0bb66 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 04_osmesa_version.diff 05_hurd-ftbfs.diff 06_kfreebsd-ftbfs.diff +07_sparc64_xform_asm.patch diff --git a/debian/rules b/debian/rules index 4b0e31c..e605708 100755 --- a/debian/rules +++ b/debian/rules @@ -76,6 +76,8 @@ else DRI_DRIVERS += i915 i965 sis unichrome else ifeq ($(DEB_HOST_ARCH), sparc) DRI_DRIVERS += ffb + else ifeq ($(DEB_HOST_ARCH), sparc64) + DRI_DRIVERS += ffb endif endif endif -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
