mirror of
https://git.yoctoproject.org/poky
synced 2026-02-16 05:33:03 +01:00
b38f910e1c
The 17.3.1 release, published in December 21, 2017, is the first 17.3 stable release for use. It fixes a number of issues since 17.3.0 release. The release notes can be seen at: - 17.3.0: https://www.mesa3d.org/relnotes/17.3.0.html - 17.3.1: https://www.mesa3d.org/relnotes/17.3.1.html This commit has reworked few patches, to apply to the new source, and dropped the backported ones. (From OE-Core rev: 75ec119eabb625509121a329b8d0f9c3cf20e0aa) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From: Otavio Salvador <otavio@ossystems.com.br>
|
|
Subject: [PATCH] Properly get LLVM version when using LLVM Git releases
|
|
|
|
$ llvm-config-host --version
|
|
5.0.0git-9a5c333388c
|
|
|
|
We need to ignore everything after 5.0.0 which is what the cut cmd is
|
|
doing
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
---
|
|
configure.ac | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index a02173f244..b107f04c2e 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -995,7 +995,7 @@ strip_unwanted_llvm_flags() {
|
|
|
|
llvm_set_environment_variables() {
|
|
if test "x$LLVM_CONFIG" != xno; then
|
|
- LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'`
|
|
+ LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5`
|
|
LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
|
|
LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
|
|
LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
|
|
@@ -2644,7 +2644,7 @@ detect_old_buggy_llvm() {
|
|
dnl ourselves.
|
|
dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
|
|
dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
|
|
- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
|
|
+ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5`
|
|
AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
|
|
|
|
if test "x$llvm_have_one_so" = xyes; then
|
|
--
|
|
2.15.1
|
|
|