[PATCH 4/9] control, patches/13-llvm-config-pick-a-version.diff: Update to llvm-3.0.
---
debian/changelog | 1 +
debian/control | 2 +-
debian/patches/13-llvm-config-pick-a-version.diff | 12 +++++-------
3 filer ändrade, 7 tillägg(+), 8 borttagningar(-)
diff --git a/debian/changelog b/debian/changelog
index 2f406fa..01003f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mesa (8.0.4-3) UNRELEASED; urgency=low
--enable-shared-glapi) from upstream.
* Cherry-pick commit 7d87c71a7 (configure: Add --with-llvm-shared-libs)
from upstream.
+ * control, patches/13-llvm-config-pick-a-version.diff: Update to llvm-3.0.
-- Jon Severinsson <jon@severinsson.net> Sat, 22 Sep 2012 20:50:00 +0200
diff --git a/debian/control b/debian/control
index ec59840..e32481d 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
+ llvm-3.0-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libwayland-dev (>= 0.85.0) [linux-any],
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
diff --git a/debian/patches/13-llvm-config-pick-a-version.diff b/debian/patches/13-llvm-config-pick-a-version.diff
index 432d2a9..5ddd278 100644
--- a/debian/patches/13-llvm-config-pick-a-version.diff
+++ b/debian/patches/13-llvm-config-pick-a-version.diff
@@ -1,16 +1,14 @@
Several versions of llvm can coexist in the archive (at the time of this
-writing, 2.8 and 2.9), so pick a version. Let's assume the last version
-receives bug fixes quickly, so pick 2.9 for now.
-Index: mesa/configure.ac
-===================================================================
---- mesa.orig/configure.ac 2012-05-21 18:19:43.639922922 -0400
-+++ mesa/configure.ac 2012-05-21 18:19:43.947922933 -0400
+writing, 2.9, 3.0 and 3.1), so pick a version.
+
+--- a/configure.ac
++++ b/configure.ac
@@ -1762,7 +1762,7 @@
esac
fi
if test "x$enable_gallium_llvm" = xyes; then
- AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
-+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-2.9], [no])
++ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.0], [no])
if test "x$LLVM_CONFIG" != xno; then
LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
--
1.7.10.4
Reply to: