diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/llvm-config-version.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/llvm-config-version.patch | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/meta/recipes-graphics/mesa/files/llvm-config-version.patch b/meta/recipes-graphics/mesa/files/llvm-config-version.patch index aa33a1e915..fd79991aab 100644 --- a/meta/recipes-graphics/mesa/files/llvm-config-version.patch +++ b/meta/recipes-graphics/mesa/files/llvm-config-version.patch | |||
@@ -1,18 +1,24 @@ | |||
1 | When building llvm from git or svn it embeds the svn/git revision into internal version string | 1 | From: Otavio Salvador <otavio@ossystems.com.br> |
2 | Subject: [PATCH] Properly get LLVM version when using LLVM Git releases | ||
2 | 3 | ||
3 | $ /mnt/a/oe/build/tmp/work/corei7-64-bec-linux/mesa/2_17.1.5-r0/recipe-sysroot/usr/lib/llvm5.0/llvm-config-host --version | 4 | $ llvm-config-host --version |
4 | 5.0.0git-9a5c333388c | 5 | 5.0.0git-9a5c333388c |
5 | 6 | ||
6 | We need to ignore everything after 5.0.0 which is what the cut cmd is doing | 7 | We need to ignore everything after 5.0.0 which is what the cut cmd is |
8 | doing | ||
7 | 9 | ||
8 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
13 | --- | ||
14 | configure.ac | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
10 | 16 | ||
11 | Index: mesa-17.1.5/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
12 | =================================================================== | 18 | index a02173f244..b107f04c2e 100644 |
13 | --- mesa-17.1.5.orig/configure.ac | 19 | --- a/configure.ac |
14 | +++ mesa-17.1.5/configure.ac | 20 | +++ b/configure.ac |
15 | @@ -967,7 +967,7 @@ strip_unwanted_llvm_flags() { | 21 | @@ -995,7 +995,7 @@ strip_unwanted_llvm_flags() { |
16 | 22 | ||
17 | llvm_set_environment_variables() { | 23 | llvm_set_environment_variables() { |
18 | if test "x$LLVM_CONFIG" != xno; then | 24 | if test "x$LLVM_CONFIG" != xno; then |
@@ -21,12 +27,15 @@ Index: mesa-17.1.5/configure.ac | |||
21 | LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` | 27 | LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` |
22 | LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` | 28 | LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` |
23 | LLVM_LIBDIR=`$LLVM_CONFIG --libdir` | 29 | LLVM_LIBDIR=`$LLVM_CONFIG --libdir` |
24 | @@ -2560,7 +2560,7 @@ if test "x$enable_llvm" = xyes; then | 30 | @@ -2644,7 +2644,7 @@ detect_old_buggy_llvm() { |
31 | dnl ourselves. | ||
25 | dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) | 32 | dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) |
26 | if test "x$enable_llvm_shared_libs" = xyes; then | 33 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, |
27 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, | 34 | - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` |
28 | - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` | 35 | + LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5` |
29 | + LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version|cut -c1-5` | 36 | AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) |
30 | AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) | ||
31 | 37 | ||
32 | if test "x$llvm_have_one_so" = xyes; then | 38 | if test "x$llvm_have_one_so" = xyes; then |
39 | -- | ||
40 | 2.15.1 | ||
41 | |||