From 4ede2115e59b111a5c00f67e1f66e28112e4664ffe2281b9663050df5338c4eb Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Thu, 13 Aug 2020 11:18:32 +0000
Subject: [PATCH] Accepting request 826251 from home:Andreas_Schwab:riscv:rust

- Add support for riscv64

OBS-URL: https://build.opensuse.org/request/show/826251
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=257
---
 rust.changes |  5 +++++
 rust.spec    | 25 +++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/rust.changes b/rust.changes
index 2128f12..075318b 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 13 10:04:38 UTC 2020 - Andreas Schwab <schwab@suse.de>
+
+- Add support for riscv64
+
 -------------------------------------------------------------------
 Fri Aug  7 05:54:43 UTC 2020 - Manfred Hollstein <manfred.h@gmx.net>
 
diff --git a/rust.spec b/rust.spec
index 48531a7..0e7d6f2 100644
--- a/rust.spec
+++ b/rust.spec
@@ -52,6 +52,10 @@
 %global rust_arch powerpc64le
 %endif
 
+%ifarch riscv64
+%global rust_arch riscv64gc
+%endif
+
 # Must restrict the x86 build to i686 since i586 is currently
 # unsupported
 %ifarch %{ix86}
@@ -131,11 +135,14 @@ Source105:      %{dl_url}/rust-%{version_bootstrap}-powerpc64-unknown-linux-gnu.
 Source106:      %{dl_url}/rust-%{version_bootstrap}-powerpc64le-unknown-linux-gnu.tar.xz
 Source107:      %{dl_url}/rust-%{version_bootstrap}-s390x-unknown-linux-gnu.tar.xz
 Source108:      %{dl_url}/rust-%{version_bootstrap}-powerpc-unknown-linux-gnu.tar.xz
+# Not yet available
+%if 0
+Source109:      %{dl_url}/rust-%{version_bootstrap}-riscv64gc-unknown-linux-gnu.tar.xz
+%endif
 # Make factory-auto stop complaining...
 Source1000:     README.suse-maint
 # PATCH-FIX-OPENSUSE: edit src/librustc_llvm/build.rs to ignore GCC incompatible flag
 Patch0:         ignore-Wstring-conversion.patch
-# PATCH-FIX-UPSTREAM: fix compilation with llvm10 https://github.com/rust-lang/rust/issues/71573
 BuildRequires:  ccache
 BuildRequires:  curl
 BuildRequires:  fdupes
@@ -191,7 +198,7 @@ Conflicts:      rust
 Conflicts:      rustc-bootstrap
 # Restrict the architectures as building rust relies on being
 # initially bootstrapped before we can build the n+1 release
-ExclusiveArch:  x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x %{ix86}
+ExclusiveArch:  x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x %{ix86} riscv64
 %ifarch %{ix86}
 ExclusiveArch:  i686
 %endif
@@ -309,9 +316,9 @@ A tool for formatting Rust code according to style guidelines.
 
 %package -n clippy
 Summary:        Lints to catch common mistakes and improve Rust code
-# /usr/bin/clippy-driver is dynamically linked against internal rustc libs
 License:        MPL-2.0
 Group:          Development/Languages/Rust
+# /usr/bin/clippy-driver is dynamically linked against internal rustc libs
 Requires:       %{name} = %{version}
 Requires:       cargo = %{version}
 Provides:       clippy = %{clippy_version}
@@ -335,10 +342,10 @@ Cargo downloads dependencies of Rust projects and compiles it.
 
 %package -n cargo-doc
 Summary:        Documentation for Cargo
-# Cargo no longer builds its own documentation
-# https://github.com/rust-lang/cargo/pull/4904
 License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
+# Cargo no longer builds its own documentation
+# https://github.com/rust-lang/cargo/pull/4904
 Requires:       rust-doc = %{version}
 BuildArch:      noarch
 
@@ -351,7 +358,7 @@ This package includes HTML documentation for Cargo.
 %setup -q -T -b 100 -n rust-%{version_bootstrap}-%{rust_triple}
 %endif
 %ifarch %{ix86}
-%setup -q -T -b 101 -n rust-%{version_bootstrap}-i686-unknown-linux-%{abi}
+%setup -q -T -b 101 -n rust-%{version_bootstrap}-%{rust_triple}
 %endif
 %ifarch aarch64
 %setup -q -T -b 102 -n rust-%{version_bootstrap}-%{rust_triple}
@@ -374,6 +381,12 @@ This package includes HTML documentation for Cargo.
 %ifarch ppc
 %setup -q -T -b 108 -n rust-%{version_bootstrap}-%{rust_triple}
 %endif
+%ifarch riscv64
+# Not yet available
+%if 0
+%setup -q -T -b 109 -n rust-%{version_bootstrap}-%{rust_triple}
+%endif
+%endif
 ./install.sh --components=cargo,rustc,rust-std-%{rust_triple} --prefix=.%{_prefix} --disable-ldconfig
 %endif