From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 16 Sep 2020 09:32:48 +0100
Subject: gentoo resync : 16.09.2020

---
 sys-devel/llvm-roc/Manifest                        |  5 ++--
 .../files/llvm-roc-3.7.0-current_pos.patch         | 32 ++++++++++++++++++++++
 sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild        |  4 +++
 sys-devel/llvm-roc/metadata.xml                    |  3 --
 4 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 sys-devel/llvm-roc/files/llvm-roc-3.7.0-current_pos.patch

(limited to 'sys-devel/llvm-roc')

diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 8a7f80f8b551..eb693674861e 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -1,4 +1,5 @@
 AUX llvm-roc-3.0.0-add_libraries.patch 648 BLAKE2B a201718b8afdc1ba18ae5d7e85a73fde7ca2bb163eecabab33d37c5815ac6ab8c4f8d960ab40f95ad6df95da626a439fbda1d20c25abb9558a37bcdf64a77e64 SHA512 7a1892c8781146830aa5bf69db20bbe7329634f469aeef0946232b15138b55d332491092ed00a4cf698033f19d8f279f4a5b34f13168d5b9ff7eba4a229e82a0
+AUX llvm-roc-3.7.0-current_pos.patch 1292 BLAKE2B 8481497e3f9c46c142034ae4c5455f94e79d9c10cc806945af64252043d46c558a3ba08078239a673937705edfd21ba85f618d1d3a5bff652d45efe4e1e70877 SHA512 6cd41988e4eb654b7040c238bef8fc10d8f5922bac9c0ba112c5ba1b57c769472d0b9deaea6822f2d6bbbfda0a27bed2c1df2bba93a79cb4bf08f24185843981
 DIST llvm-rocm-ocl-3.7.0.tar.gz 116973132 BLAKE2B c1cc8a3b95292d726626d3cb59ec1b96549682bfcbec16030e47cf1318c6ea01bc76f3349f012ce4f1e4d8b9fe192c51a025c2d08cf593622c61fe7c61969ba6 SHA512 0626075bedb3898c96c0bb0be7a2aba4662050a1c738115f661bedc03d744ace7a4581b55c6325060740c13a0e50e72e09272bb02c1186c2c4a40fc9b961dcbe
-EBUILD llvm-roc-3.7.0-r1.ebuild 1346 BLAKE2B 8094d7fe8a9f8a717d83b812d4323483e4bd8fc4f30b6ddeea84b10aad68cad10ae26289eda5038b71543db18bed37f8245e7383e7ef86d3dc3afd0507cc3093 SHA512 7dabd9d4e1fb15a26c6b010b15e68d6b6b37ec568bdbace9d57e31d8e53b2b528123f8dcc684c14b51899b05b8f0c00660a27efc0467dc1c3314dd83b1b2713d
-MISC metadata.xml 469 BLAKE2B f2b3af990bf9b130ed1be4ad2c4da5a97f6eae74d5feb43d81b4dc90ca1c5dcf896b293ad60d1c932d0c64773c203c52ccca8a6e0e5dd1d614f97b53113146db SHA512 e3783dde65d914cc272478c2d1823de27a2daaf8fa3aa2d281b98b0ed707c758bce1d52326dda577baed5b127293fca435211cfee17cc43553b9be424a4e2348
+EBUILD llvm-roc-3.7.0-r1.ebuild 1397 BLAKE2B 08aec56b8ab26093f28a9118ca043adb35dcb84ae5899da5890cbeecb5d10f8d6b08e767a490272a5f35d1b3a5ee8d912a52b448ee57582cda9f99fce57ec8ec SHA512 745f2a9fa18bc3b9d76a324beb1e5165f9be8f720ef133b35e1509c08c08e48872ec4c7402e52d29a3b493e27729a43081fd0e90afe90d30b64d6da3f046e824
+MISC metadata.xml 365 BLAKE2B 22b9f4a7b16e5666ba2945afd12d7814477261cc16b67d87c220172561aa543bd5123f562be4b9dff1df396eec792a7d0ca48069f1f6f325a1e328d54ae86304 SHA512 1244d72c8f7c8d281bb66a63df7a964fa41724c49032ab565627e11080ef055e80c786dae3c0d963242b894dc7bcab9f7243018f51abe7dd96bea2bf7cc4faa7
diff --git a/sys-devel/llvm-roc/files/llvm-roc-3.7.0-current_pos.patch b/sys-devel/llvm-roc/files/llvm-roc-3.7.0-current_pos.patch
new file mode 100644
index 000000000000..a0d3c1df6d99
--- /dev/null
+++ b/sys-devel/llvm-roc/files/llvm-roc-3.7.0-current_pos.patch
@@ -0,0 +1,32 @@
+https://bugs.llvm.org/show_bug.cgi?id=43235
+
+diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
+index 705f1790b1d..a0314b2c46a 100644
+--- a/include/llvm/Support/raw_ostream.h
++++ b/include/llvm/Support/raw_ostream.h
+@@ -507,9 +507,7 @@ class raw_string_ostream : public raw_ostream {
+   /// See raw_ostream::write_impl.
+   void write_impl(const char *Ptr, size_t Size) override;
+ 
+-  /// Return the current position within the stream, not counting the bytes
+-  /// currently in the buffer.
+-  uint64_t current_pos() const override { return OS.size(); }
++  uint64_t current_pos() const override;
+ 
+ public:
+   explicit raw_string_ostream(std::string &O) : OS(O) {}
+diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
+index 4bb315f824a..742e2aced39 100644
+--- a/lib/Support/raw_ostream.cpp
++++ b/lib/Support/raw_ostream.cpp
+@@ -895,6 +895,10 @@ raw_ostream &llvm::nulls() {
+ //  raw_string_ostream
+ //===----------------------------------------------------------------------===//
+ 
++/// Return the current position within the stream, not counting the bytes
++/// currently in the buffer.
++uint64_t raw_string_ostream::current_pos() const { return OS.size(); }
++
+ raw_string_ostream::~raw_string_ostream() {
+   flush();
+ }
diff --git a/sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild b/sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
index ec60b28f0853..6586ec782b77 100644
--- a/sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
+++ b/sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
@@ -23,6 +23,10 @@ PDEPEND="dev-libs/rocr-runtime"
 
 S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
 
+PATCHES=(
+	"${FILESDIR}/${P}-current_pos.patch"
+)
+
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
 src_prepare() {
diff --git a/sys-devel/llvm-roc/metadata.xml b/sys-devel/llvm-roc/metadata.xml
index 971e48876cfb..303f9081b054 100644
--- a/sys-devel/llvm-roc/metadata.xml
+++ b/sys-devel/llvm-roc/metadata.xml
@@ -8,7 +8,4 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/llvm</remote-id>
     </upstream>
-    <longdescription lang="en">
-        Radeon Open Compute llvm, clang, and lld
-    </longdescription>
 </pkgmetadata>
-- 
cgit v1.2.3