summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-02-05 00:50:31 -0800
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-02-05 01:00:51 -0800
commitaab36ad45d07887af2a9e110f57762f7c3bbdcbb (patch)
treefe1ace5fa5453076b88a96f1bf2ebea24aa7f2e3
parentdev-libs/unibilium: remove old (diff)
downloadgentoo-aab36ad45d07887af2a9e110f57762f7c3bbdcbb.tar.gz
gentoo-aab36ad45d07887af2a9e110f57762f7c3bbdcbb.tar.bz2
gentoo-aab36ad45d07887af2a9e110f57762f7c3bbdcbb.zip
dev-lang/rust: fix build of bundled llvm with gcc10
Bug: https://bugs.gentoo.org/708320 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r--dev-lang/rust/files/llvm-gcc10.patch34
-rw-r--r--dev-lang/rust/rust-1.41.0.ebuild1
2 files changed, 35 insertions, 0 deletions
diff --git a/dev-lang/rust/files/llvm-gcc10.patch b/dev-lang/rust/files/llvm-gcc10.patch
new file mode 100644
index 00000000000..8fbaa923f7c
--- /dev/null
+++ b/dev-lang/rust/files/llvm-gcc10.patch
@@ -0,0 +1,34 @@
+From b288d90b39f4b905c02092a9bfcfd6d78f99b191 Mon Sep 17 00:00:00 2001
+From: Than McIntosh <thanm@google.com>
+Date: Fri, 19 Jul 2019 13:13:54 +0000
+Subject: [PATCH] [NFC] include cstdint/string prior to using uint8_t/string
+
+Summary: include proper header prior to use of uint8_t typedef
+and std::string.
+
+Subscribers: llvm-commits
+
+Reviewers: cherry
+
+Tags: #llvm
+
+Differential Revision: https://reviews.llvm.org/D64937
+
+llvm-svn: 366572
+---
+ llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/llbm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h b/src/llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
+index da9d9d5bfdc0..3d47471f0ef0 100644
+--- a/src/llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
++++ b/src/llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
+@@ -16,6 +16,8 @@
+ #include "llvm/Demangle/DemangleConfig.h"
+ #include "llvm/Demangle/StringView.h"
+ #include <array>
++#include <cstdint>
++#include <string>
+
+ namespace llvm {
+ namespace itanium_demangle {
diff --git a/dev-lang/rust/rust-1.41.0.ebuild b/dev-lang/rust/rust-1.41.0.ebuild
index 43135125703..0139d999763 100644
--- a/dev-lang/rust/rust-1.41.0.ebuild
+++ b/dev-lang/rust/rust-1.41.0.ebuild
@@ -106,6 +106,7 @@ QA_SONAME="usr/lib.*/librustc_macros.*.so"
PATCHES=(
"${FILESDIR}"/1.40.0-add-soname.patch
+ "${FILESDIR}"/llvm-gcc10.patch
)
S="${WORKDIR}/${MY_P}-src"