← Back to branch summary

~ubuntu-branches/ubuntu/raring/mesa/raring-proposed

« back to all changes in this revision

Viewing changes to debian/patches/13-llvm-config-pick-a-version.diff

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2011-06-19 21:26:00 UTC
  • mfrom: (1.6.1 upstream) (3.3.18 sid)
  • mto: (3.3.20 sid)
  • mto: This revision was merged to the branch mainline in revision 145.
  • Revision ID: james.westby@ubuntu.com-20110619212600-rleaapdmnbtstekb
Tags: 7.11~0-2
Thank you sbuild for giving a green light when that's not actually the
case. Fix missing Pre-Depends for the libegl1-mesa-drivers package
(multiarch-support).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/13-llvm-config-pick-a-version.diff
 
1
Several versions of llvm can coexist in the archive (at the time of this
 
2
writing, 2.8 and 2.9), so pick a version. Let's assume the last version
 
3
receives bug fixes quickly, so pick 2.9 for now.
 
4
--- a/configure.ac
 
5
+++ b/configure.ac
 
6
@@ -1458,7 +1458,7 @@ if test "x$enable_gallium" = xno -a "x$e
 
7
 fi
 
8
 if test "x$enable_gallium" = xyes; then
 
9
     SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
 
10
-    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
 
11
+    AC_PATH_PROG([LLVM_CONFIG], [llvm-config-2.9], [no])
 
12
 else
 
13
     LLVM_CONFIG=no
 
14
 fi