debian/changelog | 1 + debian/control | 2 +- debian/patches/115_llvm_dynamic_linking.diff | 2 +- debian/patches/13-llvm-config-pick-a-version.diff | 5 ++++- 4 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit 600ea773b4dc54d184c020908cd7e9658feb78f1 Author: Robert Hooker <sarv...@ubuntu.com> Date: Tue Jan 31 00:35:41 2012 -0500 debian/changelog: Document change to llvm 3.0 diff --git a/debian/changelog b/debian/changelog index 9c3dab0..45d1a84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ mesa (8.0~rc2-0ubuntu1) UNRELEASED; urgency=low * Fix up 116_use_shared_galliumcore.diff so it works. * debian/rules: Fix up dh_shlibdeps call. * debian/control: Bump libwayland-dev build requirements. + * Switch to llvm 3.0. -- Robert Hooker <sarv...@ubuntu.com> Mon, 30 Jan 2012 17:55:52 -0500 commit 258419229156c90aee1775327f7eeb15871df2cc Author: Robert Hooker <sarv...@ubuntu.com> Date: Mon Jan 30 20:55:46 2012 -0500 Switch to llvm-3.0 diff --git a/debian/control b/debian/control index 916dfcb..7007c46 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,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.1.0~2-1), 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/115_llvm_dynamic_linking.diff b/debian/patches/115_llvm_dynamic_linking.diff index cbc629f..d241a6a 100644 --- a/debian/patches/115_llvm_dynamic_linking.diff +++ b/debian/patches/115_llvm_dynamic_linking.diff @@ -7,7 +7,7 @@ Index: mesa/configure.ac LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'` LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g'` - LLVM_LIBS="`$LLVM_CONFIG --libs`" -+ LLVM_LIBS="-lLLVM-2.9" ++ LLVM_LIBS="-lLLVM-3.0" LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS" diff --git a/debian/patches/13-llvm-config-pick-a-version.diff b/debian/patches/13-llvm-config-pick-a-version.diff index a4ad365..0350aa2 100644 --- a/debian/patches/13-llvm-config-pick-a-version.diff +++ b/debian/patches/13-llvm-config-pick-a-version.diff @@ -1,6 +1,9 @@ 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. + +(Ammended 01/30/2012 - Sarvatt) +Switch to 3.0 for ubuntu 12.04 Index: mesa/configure.ac =================================================================== --- mesa.orig/configure.ac 2012-01-18 16:06:14.824947429 +0200 @@ -10,7 +13,7 @@ Index: mesa/configure.ac 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'` -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rs6nd-0002af...@vasks.debian.org