summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch')
-rw-r--r--meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch b/meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
new file mode 100644
index 0000000000..94189ac714
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
@@ -0,0 +1,44 @@
1From 33025fb1650768a0b923f3c824c270628eef83db Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 5 Jun 2018 11:11:10 -0300
4Subject: [PATCH 5/7] Properly get LLVM version when using LLVM Git releases
5Organization: O.S. Systems Software LTDA.
6
7$ llvm-config-host --version
85.0.0git-9a5c333388c
9
10We need to ignore everything after 5.0.0 which is what the cut cmd is
11doing
12
13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16---
17 configure.ac | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 7c95598afc..c248248c6b 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -1075,7 +1075,7 @@ strip_unwanted_llvm_flags() {
25
26 llvm_set_environment_variables() {
27 if test "x$LLVM_CONFIG" != xno; then
28- LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'`
29+ LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5`
30 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
31 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
32 LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
33@@ -2776,7 +2776,7 @@ detect_old_buggy_llvm() {
34 dnl ourselves.
35 dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
36 dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
37- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
38+ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5`
39 AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
40
41 if test "x$llvm_have_one_so" = xyes; then
42--
432.17.1
44