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