mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #324 from YoeDistro/yoe/mut

Browse Source 
rust-llvm: Fix build with gcc11
This commit is contained in:
Cody Schafer
2021-03-02 20:19:55 -05:00
committed by GitHub
parent 3f3aa9a6bb 013b210033
commit 9a035fe272
3 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-devtools/rust/rust-llvm.inc
+3 -1
View File
@@ -1,7 +1,9 @@
SUMMARY = "LLVM compiler framework (packaged with rust)" SUMMARY = "LLVM compiler framework (packaged with rust)"
LICENSE ?= "Apache-2.0-with-LLVM-exception" LICENSE ?= "Apache-2.0-with-LLVM-exception"
SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch" SRC_URI += "file://0001-nfc-Fix-missing-include.patch;striplevel=2 \
file://0002-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
"
S = "${RUSTSRC}/src/llvm-project/llvm" S = "${RUSTSRC}/src/llvm-project/llvm"
recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch
+26
View File
@@ -0,0 +1,26 @@
From 3b7e611bd58ba842470d17374c550e14bceca5c7 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@redhat.com>
Date: Tue, 10 Nov 2020 14:55:25 +0100
Subject: [PATCH] [nfc] Fix missing include
Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
llvm/utils/benchmark/src/benchmark_register.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/llvm/utils/benchmark/src/benchmark_register.h b/llvm/utils/benchmark/src/benchmark_register.h
index 0705e219f2fa..4caa5ad4da07 100644
--- a/llvm/utils/benchmark/src/benchmark_register.h
+++ b/llvm/utils/benchmark/src/benchmark_register.h
@@ -1,6 +1,7 @@
#ifndef BENCHMARK_REGISTER_H
#define BENCHMARK_REGISTER_H
+#include <limits>
#include <vector>
#include "check.h"
--
2.30.1
recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch
+3 -3
View File
@@ -11,11 +11,11 @@ llvm-config from a target sysroot.
Signed-off-by: Martin Kelly <mkelly@xevo.com> Signed-off-by: Martin Kelly <mkelly@xevo.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- ---
tools/llvm-config/llvm-config.cpp | 7 +++++++ llvm/tools/llvm-config/llvm-config.cpp | 7 +++++++
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
--- a/tools/llvm-config/llvm-config.cpp --- a/llvm/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp +++ b/llvm/tools/llvm-config/llvm-config.cpp
@@ -226,6 +226,13 @@ Typical components:\n\ @@ -226,6 +226,13 @@ Typical components:\n\
/// Compute the path to the main executable. /// Compute the path to the main executable.