From f9ebc89c02d357fd38373c1073bab1efd28c80c9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Jul 2011 16:02:33 +0200 Subject: [PATCH] Mesa: add patch to link against shared LLVM library Signed-off-by: Stephan Raue --- packages/graphics/Mesa/meta | 3 +-- .../Mesa/patches/Mesa-7.11-rc2-llvm_so.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta index 115295f728..330b369cb5 100644 --- a/packages/graphics/Mesa/meta +++ b/packages/graphics/Mesa/meta @@ -40,6 +40,5 @@ get_graphicdrivers if [ "$LLVM_SUPPORT" = "yes" ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm" -# actually we dont need llvm installed because its linked statically -# PKG_DEPENDS="$PKG_DEPENDS llvm" + PKG_DEPENDS="$PKG_DEPENDS llvm" fi diff --git a/packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch b/packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch new file mode 100644 index 0000000000..378b1a7a70 --- /dev/null +++ b/packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch @@ -0,0 +1,12 @@ +diff -Naur Mesa-7.11-rc2-old/configure.ac Mesa-7.11-rc2-new/configure.ac +--- Mesa-7.11-rc2-old/configure.ac 2011-07-19 16:39:56.000000000 -0700 ++++ Mesa-7.11-rc2-new/configure.ac 2011-07-21 10:08:33.000000000 -0700 +@@ -1737,7 +1737,7 @@ + if test "x$LLVM_CONFIG" != xno; then + LLVM_VERSION=`$LLVM_CONFIG --version` + LLVM_CFLAGS=`$LLVM_CONFIG --cppflags` +- LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++" ++ LLVM_LIBS="-lLLVM-$LLVM_VERSION -lstdc++" + + LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"