mirror of
https://git.yoctoproject.org/poky
synced 2026-07-21 05:27:01 +00:00
Otavio Salvador
3ad9909e59
This upgrades mesa to the 18.1.7 stable release. The changes can be found at: https://www.mesa3d.org/relnotes/18.1.4.html https://www.mesa3d.org/relnotes/18.1.5.html https://www.mesa3d.org/relnotes/18.1.6.html https://www.mesa3d.org/relnotes/18.1.7.html (From OE-Core rev: a77eb44bb1ff2ece9dcff1f7b5fe671ea3ae034d) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001
|
|
From: Otavio Salvador <otavio@ossystems.com.br>
|
|
Date: Tue, 5 Jun 2018 11:11:10 -0300
|
|
Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases
|
|
Organization: O.S. Systems Software LTDA.
|
|
|
|
$ 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 916d0bd207..dd172f1ebe 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1090,7 +1090,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`
|
|
@@ -2808,7 +2808,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.18.0
|
|
|