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 | 13 |
1 files changed, 7 insertions, 6 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 index 59b118d9f4..96edc2172b 100644 --- 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From c5b5bf6c31be1823be1d0317eabe16558a4f0762 Mon Sep 17 00:00:00 2001 | 1 | From ce7b9ff6517fda089f296b2af2c1c49604872514 Mon Sep 17 00:00:00 2001 |
2 | From: Otavio Salvador <otavio@ossystems.com.br> | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
3 | Date: Tue, 5 Jun 2018 11:11:10 -0300 | 3 | Date: Tue, 5 Jun 2018 11:11:10 -0300 |
4 | Subject: [PATCH 3/5] Properly get LLVM version when using LLVM Git releases | 4 | Subject: [PATCH 3/4] Properly get LLVM version when using LLVM Git releases |
5 | Organization: O.S. Systems Software LTDA. | 5 | Organization: O.S. Systems Software LTDA. |
6 | 6 | ||
7 | $ llvm-config-host --version | 7 | $ llvm-config-host --version |
@@ -13,15 +13,16 @@ doing | |||
13 | Upstream-Status: Pending | 13 | Upstream-Status: Pending |
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
16 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
16 | --- | 17 | --- |
17 | configure.ac | 4 ++-- | 18 | configure.ac | 4 ++-- |
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
19 | 20 | ||
20 | diff --git a/configure.ac b/configure.ac | 21 | diff --git a/configure.ac b/configure.ac |
21 | index cbc455e130f..0065376f4b7 100644 | 22 | index 1816a4cd475..13fed9daf59 100644 |
22 | --- a/configure.ac | 23 | --- a/configure.ac |
23 | +++ b/configure.ac | 24 | +++ b/configure.ac |
24 | @@ -1111,7 +1111,7 @@ strip_unwanted_llvm_flags() { | 25 | @@ -1124,7 +1124,7 @@ strip_unwanted_llvm_flags() { |
25 | 26 | ||
26 | llvm_set_environment_variables() { | 27 | llvm_set_environment_variables() { |
27 | if test "x$LLVM_CONFIG" != xno; then | 28 | if test "x$LLVM_CONFIG" != xno; then |
@@ -30,7 +31,7 @@ index cbc455e130f..0065376f4b7 100644 | |||
30 | LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` | 31 | LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` |
31 | LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` | 32 | LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` |
32 | LLVM_LIBDIR=`$LLVM_CONFIG --libdir` | 33 | LLVM_LIBDIR=`$LLVM_CONFIG --libdir` |
33 | @@ -2860,7 +2860,7 @@ detect_old_buggy_llvm() { | 34 | @@ -2870,7 +2870,7 @@ detect_old_buggy_llvm() { |
34 | dnl ourselves. | 35 | dnl ourselves. |
35 | dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) | 36 | 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 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, |
@@ -40,5 +41,5 @@ index cbc455e130f..0065376f4b7 100644 | |||
40 | 41 | ||
41 | if test "x$llvm_have_one_so" = xyes; then | 42 | if test "x$llvm_have_one_so" = xyes; then |
42 | -- | 43 | -- |
43 | 2.20.1 | 44 | 2.21.0 |
44 | 45 | ||