[beignet] 01/04: prefer newer llvm versions over 3.3

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository beignet.

commit 6a7b2f7a1efdf970c76ecafa55fe4eb4c8c6517e
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 7 04:17:42 2015 +0100

    prefer newer llvm versions over 3.3
---
 debian/changelog                       |  1 +
 debian/patches/llvm-search-order.patch | 20 ++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e3df5d7..c96a636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ beignet (1.0.1-1) UNRELEASED; urgency=medium
   * Add -dbg package with debug symbols.
   * Update watch file.
   * Refresh patches.
+  * llvm-search-order.patch: New. Prefer newer llvm versions.
 
   [ Rebecca N. Palmer ]
   * Use -Bsymbolic to make sure we jump to our LLVM and not mesa's.
diff --git a/debian/patches/llvm-search-order.patch b/debian/patches/llvm-search-order.patch
new file mode 100644
index 0000000..744905d
--- /dev/null
+++ b/debian/patches/llvm-search-order.patch
@@ -0,0 +1,20 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: prefer newer llvm versions over 3.3
+
+--- a/CMake/FindLLVM.cmake
++++ b/CMake/FindLLVM.cmake
+@@ -8,12 +8,12 @@
+ # LLVM_FOUND       - True if llvm found.
+ if (LLVM_INSTALL_DIR)
+   find_program(LLVM_CONFIG_EXECUTABLE
+-               NAMES llvm-config-33 llvm-config-3.3 llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 llvm-config
++               NAMES llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 llvm-config-33 llvm-config-3.3 llvm-config
+                DOC "llvm-config executable"
+                PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
+ else (LLVM_INSTALL_DIR)
+   find_program(LLVM_CONFIG_EXECUTABLE
+-               NAMES llvm-config-33 llvm-config-3.3 llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 llvm-config
++               NAMES llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4 llvm-config-33 llvm-config-3.3 llvm-config
+                DOC "llvm-config executable")
+ endif (LLVM_INSTALL_DIR)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3e46a9d..8483730 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Link-against-terminfo.patch
 Enable-test-debug.patch
 fix-compiler_fill_image_1d_array.patch
 fail-gracefully-cl_mem_allocate.patch
+llvm-search-order.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git