Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | When building llvm from git or svn it embeds the svn/git revision into internal version string |
| 2 | |
| 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 | 5.0.0git-9a5c333388c |
| 5 | |
| 6 | We need to ignore everything after 5.0.0 which is what the cut cmd is doing |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |
| 11 | Index: mesa-17.1.5/configure.ac |
| 12 | =================================================================== |
| 13 | --- mesa-17.1.5.orig/configure.ac |
| 14 | +++ mesa-17.1.5/configure.ac |
| 15 | @@ -967,7 +967,7 @@ strip_unwanted_llvm_flags() { |
| 16 | |
| 17 | llvm_set_environment_variables() { |
| 18 | if test "x$LLVM_CONFIG" != xno; then |
| 19 | - LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` |
| 20 | + LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5` |
| 21 | LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` |
| 22 | LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` |
| 23 | LLVM_LIBDIR=`$LLVM_CONFIG --libdir` |
| 24 | @@ -2560,7 +2560,7 @@ if test "x$enable_llvm" = xyes; then |
| 25 | dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) |
| 26 | if test "x$enable_llvm_shared_libs" = xyes; then |
| 27 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, |
| 28 | - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` |
| 29 | + LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version|cut -c1-5` |
| 30 | AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) |
| 31 | |
| 32 | if test "x$llvm_have_one_so" = xyes; then |