Skip to content

Commit 6537186

Browse files
authored
Merge pull request #5 from sailfishos/aarch64
Enable aarch64 build.
2 parents 211461e + cd0dfd9 commit 6537186

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:bcc916003cb9c7ff44f5f9af348020b422dbc5bd4fe49bdbda2de6ce0a1bb745
3+
size 156675554

rust.changes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Mon Oct 26 2020 Matti Kosola <[email protected]> - 1.44.0+git4
2+
- [rust] Enable aarch64 build. Fixes JB#50504
3+
14
* Fri Jul 10 2020 Matti Kosola <[email protected]> - 1.44.0+git3
25
- [rust] Clean up packaging. JB#50106
36
- [rust] Use default codegen units. JB#50106

rust.spec

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66
%ifarch %ix86
77
%global rust_triple i686-unknown-linux-gnu
88
%else
9+
%ifarch %{arm}
910
%global rust_triple armv7-unknown-linux-gnueabihf
11+
%else
12+
%ifarch aarch64
13+
%global rust_triple aarch64-unknown-linux-gnu
14+
%endif
15+
%endif
1016
%endif
1117

1218
%global python python3
@@ -15,7 +21,7 @@
1521
%bcond_without lldb
1622

1723
Name: rust
18-
Version: %{rust_version}+git3
24+
Version: %{rust_version}+git4
1925
Release: 1
2026
Summary: The Rust Programming Language
2127
License: (ASL 2.0 or MIT) and (BSD and MIT)
@@ -26,6 +32,7 @@ URL: https://www.rust-lang.org
2632
Source0: rustc-%{rust_version}-src.tar.gz
2733
Source100: rust-%{rust_version}-i686-unknown-linux-gnu.tar.gz
2834
Source101: rust-%{rust_version}-armv7-unknown-linux-gnueabihf.tar.gz
35+
Source102: rust-%{rust_version}-aarch64-unknown-linux-gnu.tar.gz
2936
Source200: README.md
3037

3138
Patch1: 0001-Use-a-non-existent-test-path-instead-of-clobbering-d.patch
@@ -56,9 +63,6 @@ BuildRequires: procps
5663
# debuginfo-gdb tests need gdb
5764
BuildRequires: gdb
5865

59-
# Disable aach64 build
60-
ExcludeArch: aarch64
61-
6266
# Virtual provides for folks who attempt "dnf install rustc"
6367
Provides: rustc = %{version}-%{release}
6468
Provides: rustc = %{version}-%{release}
@@ -150,7 +154,16 @@ and ensure that you'll always get a repeatable build.
150154
%ifarch %ix86
151155
%setup -q -n %{bootstrap_root} -T -b 100
152156
%else
157+
%ifarch %{arm}
153158
%setup -q -n %{bootstrap_root} -T -b 101
159+
%else
160+
%ifarch aarch64
161+
%setup -q -n %{bootstrap_root} -T -b 102
162+
%else
163+
echo "No idea how to build for your arch..."
164+
exit 1
165+
%endif
166+
%endif
154167
%endif
155168
./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
156169
--prefix=%{local_rust_root} --disable-ldconfig

0 commit comments

Comments
 (0)