import rust-1.44.1-1.module+el8.3.0+7365+84ca0df7
This commit is contained in:
commit
a3bf0c9366
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
SOURCES/rustc-1.44.1-src.tar.xz
|
1
.rust.metadata
Normal file
1
.rust.metadata
Normal file
@ -0,0 +1 @@
|
||||
a5276687cf61f884177aed3c7230f166bc87a9f0 SOURCES/rustc-1.44.1-src.tar.xz
|
56
SOURCES/rust-pr71782-Use-a-non-existent-test-path.patch
Normal file
56
SOURCES/rust-pr71782-Use-a-non-existent-test-path.patch
Normal file
@ -0,0 +1,56 @@
|
||||
From fbd3fbdb24563a9d8fd3651f6bdc90bbbbd81d3e Mon Sep 17 00:00:00 2001
|
||||
From: Josh Stone <jistone@redhat.com>
|
||||
Date: Fri, 1 May 2020 16:50:10 -0700
|
||||
Subject: [PATCH] Use a non-existent test path instead of clobbering /dev/null
|
||||
|
||||
---
|
||||
src/test/ui/non-ice-error-on-worker-io-fail.rs | 10 +++++++---
|
||||
src/test/ui/non-ice-error-on-worker-io-fail.stderr | 2 +-
|
||||
2 files changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.rs b/src/test/ui/non-ice-error-on-worker-io-fail.rs
|
||||
index 8af17742850d..30779fc65c0f 100644
|
||||
--- a/src/test/ui/non-ice-error-on-worker-io-fail.rs
|
||||
+++ b/src/test/ui/non-ice-error-on-worker-io-fail.rs
|
||||
@@ -4,8 +4,12 @@
|
||||
//
|
||||
// An attempt to `-o` into a directory we cannot write into should indeed
|
||||
// be an error; but not an ICE.
|
||||
+//
|
||||
+// However, some folks run tests as root, which can write `/dev/` and end
|
||||
+// up clobbering `/dev/null`. Instead we'll use a non-existent path, which
|
||||
+// also used to ICE, but even root can't magically write there.
|
||||
|
||||
-// compile-flags: -o /dev/null
|
||||
+// compile-flags: -o /does-not-exist/output
|
||||
|
||||
// The error-pattern check occurs *before* normalization, and the error patterns
|
||||
// are wildly different between build environments. So this is a cop-out (and we
|
||||
@@ -15,10 +19,10 @@
|
||||
// error-pattern: error
|
||||
|
||||
// On Mac OS X, we get an error like the below
|
||||
-// normalize-stderr-test "failed to write bytecode to /dev/null.non_ice_error_on_worker_io_fail.*" -> "io error modifying /dev/"
|
||||
+// normalize-stderr-test "failed to write bytecode to /does-not-exist/output.non_ice_error_on_worker_io_fail.*" -> "io error modifying /does-not-exist/"
|
||||
|
||||
// On Linux, we get an error like the below
|
||||
-// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /dev/"
|
||||
+// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /does-not-exist/"
|
||||
|
||||
// ignore-tidy-linelength
|
||||
// ignore-windows - this is a unix-specific test
|
||||
diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.stderr b/src/test/ui/non-ice-error-on-worker-io-fail.stderr
|
||||
index f732abc52b71..edadecf273a7 100644
|
||||
--- a/src/test/ui/non-ice-error-on-worker-io-fail.stderr
|
||||
+++ b/src/test/ui/non-ice-error-on-worker-io-fail.stderr
|
||||
@@ -1,6 +1,6 @@
|
||||
warning: ignoring --out-dir flag due to -o flag
|
||||
|
||||
-error: io error modifying /dev/
|
||||
+error: io error modifying /does-not-exist/
|
||||
|
||||
error: aborting due to previous error; 1 warning emitted
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
42
SOURCES/rustc-1.42.0-disable-libssh2.patch
Normal file
42
SOURCES/rustc-1.42.0-disable-libssh2.patch
Normal file
@ -0,0 +1,42 @@
|
||||
--- rustc-1.42.0-src/Cargo.lock.orig 2020-03-09 15:11:17.000000000 -0700
|
||||
+++ rustc-1.42.0-src/Cargo.lock 2020-04-02 16:39:22.268896227 -0700
|
||||
@@ -1796,7 +1796,6 @@
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
- "libssh2-sys",
|
||||
"libz-sys",
|
||||
"openssl-sys",
|
||||
"pkg-config",
|
||||
@@ -1813,20 +1812,6 @@
|
||||
]
|
||||
|
||||
[[package]]
|
||||
-name = "libssh2-sys"
|
||||
-version = "0.2.14"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "36aa6e813339d3a063292b77091dfbbb6152ff9006a459895fa5bebed7d34f10"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
- "libc",
|
||||
- "libz-sys",
|
||||
- "openssl-sys",
|
||||
- "pkg-config",
|
||||
- "vcpkg",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
name = "libz-sys"
|
||||
version = "1.0.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
--- rustc-1.42.0-src/vendor/git2/Cargo.toml.orig 2020-03-09 17:00:19.000000000 -0700
|
||||
+++ rustc-1.42.0-src/vendor/git2/Cargo.toml 2020-04-02 16:38:46.163664007 -0700
|
||||
@@ -55,7 +55,7 @@
|
||||
version = "0.1.39"
|
||||
|
||||
[features]
|
||||
-default = ["ssh", "https", "ssh_key_from_memory"]
|
||||
+default = ["https"]
|
||||
https = ["libgit2-sys/https", "openssl-sys", "openssl-probe"]
|
||||
ssh = ["libgit2-sys/ssh"]
|
||||
ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
|
856
SPECS/rust.spec
Normal file
856
SPECS/rust.spec
Normal file
@ -0,0 +1,856 @@
|
||||
# Only x86_64 and i686 are Tier 1 platforms at this time.
|
||||
# https://forge.rust-lang.org/platform-support.html
|
||||
#global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
|
||||
%global rust_arches x86_64 i686 aarch64 ppc64le s390x
|
||||
|
||||
# The channel can be stable, beta, or nightly
|
||||
%{!?channel: %global channel stable}
|
||||
|
||||
# To bootstrap from scratch, set the channel and date from src/stage0.txt
|
||||
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
|
||||
# or nightly wants some beta-YYYY-MM-DD
|
||||
# Note that cargo matches the program version here, not its crate version.
|
||||
%global bootstrap_rust 1.43.1
|
||||
%global bootstrap_cargo 1.43.1
|
||||
%global bootstrap_channel 1.43.1
|
||||
%global bootstrap_date 2020-05-07
|
||||
|
||||
# Only the specified arches will use bootstrap binaries.
|
||||
#global bootstrap_arches %%{rust_arches}
|
||||
|
||||
# Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases.
|
||||
%bcond_with llvm_static
|
||||
|
||||
# We can also choose to just use Rust's bundled LLVM, in case the system LLVM
|
||||
# is insufficient. Rust currently requires LLVM 7.0+.
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6 && !0%{?epel}
|
||||
%bcond_without bundled_llvm
|
||||
%else
|
||||
%bcond_with bundled_llvm
|
||||
%endif
|
||||
|
||||
# libgit2-sys expects to use its bundled library, which is sometimes just a
|
||||
# snapshot of libgit2's master branch. This can mean the FFI declarations
|
||||
# won't match our released libgit2.so, e.g. having changed struct fields.
|
||||
# So, tread carefully if you toggle this...
|
||||
%bcond_without bundled_libgit2
|
||||
|
||||
%if 0%{?rhel}
|
||||
%bcond_without disabled_libssh2
|
||||
%else
|
||||
%bcond_with bundled_libssh2
|
||||
%endif
|
||||
|
||||
# LLDB isn't available everywhere...
|
||||
%if !0%{?rhel} || 0%{?rhel} > 7
|
||||
%bcond_without lldb
|
||||
%else
|
||||
%bcond_with lldb
|
||||
%endif
|
||||
|
||||
Name: rust
|
||||
Version: 1.44.1
|
||||
Release: 1%{?dist}
|
||||
Summary: The Rust Programming Language
|
||||
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
||||
# ^ written as: (rust itself) and (bundled libraries)
|
||||
URL: https://www.rust-lang.org
|
||||
ExclusiveArch: %{rust_arches}
|
||||
|
||||
%if "%{channel}" == "stable"
|
||||
%global rustc_package rustc-%{version}-src
|
||||
%else
|
||||
%global rustc_package rustc-%{channel}-src
|
||||
%endif
|
||||
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
|
||||
|
||||
# https://github.com/rust-lang/rust/pull/71782
|
||||
Patch1: rust-pr71782-Use-a-non-existent-test-path.patch
|
||||
|
||||
# Disable cargo->libgit2->libssh2, as it's not approved for FIPS (rhbz1732949)
|
||||
Patch10: rustc-1.42.0-disable-libssh2.patch
|
||||
|
||||
# Get the Rust triple for any arch.
|
||||
%{lua: function rust_triple(arch)
|
||||
local abi = "gnu"
|
||||
if arch == "armv7hl" then
|
||||
arch = "armv7"
|
||||
abi = "gnueabihf"
|
||||
elseif arch == "ppc64" then
|
||||
arch = "powerpc64"
|
||||
elseif arch == "ppc64le" then
|
||||
arch = "powerpc64le"
|
||||
end
|
||||
return arch.."-unknown-linux-"..abi
|
||||
end}
|
||||
|
||||
%global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))}
|
||||
|
||||
%if %defined bootstrap_arches
|
||||
# For each bootstrap arch, add an additional binary Source.
|
||||
# Also define bootstrap_source just for the current target.
|
||||
%{lua: do
|
||||
local bootstrap_arches = {}
|
||||
for arch in string.gmatch(rpm.expand("%{bootstrap_arches}"), "%S+") do
|
||||
table.insert(bootstrap_arches, arch)
|
||||
end
|
||||
local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}"
|
||||
.."/rust-%{bootstrap_channel}")
|
||||
local target_arch = rpm.expand("%{_target_cpu}")
|
||||
for i, arch in ipairs(bootstrap_arches) do
|
||||
print(string.format("Source%d: %s-%s.tar.xz\n",
|
||||
i, base, rust_triple(arch)))
|
||||
if arch == target_arch then
|
||||
rpm.define("bootstrap_source "..i)
|
||||
end
|
||||
end
|
||||
end}
|
||||
%endif
|
||||
|
||||
%ifarch %{bootstrap_arches}
|
||||
%global bootstrap_root rust-%{bootstrap_channel}-%{rust_triple}
|
||||
%global local_rust_root %{_builddir}/%{bootstrap_root}/usr
|
||||
Provides: bundled(%{name}-bootstrap) = %{bootstrap_rust}
|
||||
%else
|
||||
BuildRequires: cargo >= %{bootstrap_cargo}
|
||||
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
|
||||
BuildRequires: (%{name} >= %{bootstrap_rust} with %{name} <= %{version})
|
||||
%else
|
||||
BuildRequires: %{name} >= %{bootstrap_rust}
|
||||
BuildConflicts: %{name} > %{version}
|
||||
%endif
|
||||
%global local_rust_root %{_prefix}
|
||||
%endif
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: curl
|
||||
BuildRequires: pkgconfig(libcurl)
|
||||
BuildRequires: pkgconfig(liblzma)
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
||||
%if %without bundled_libgit2
|
||||
BuildRequires: pkgconfig(libgit2) >= 1.0.0
|
||||
%endif
|
||||
|
||||
%if %{without disabled_libssh2} && %{without bundled_libssh2}
|
||||
# needs libssh2_userauth_publickey_frommemory
|
||||
BuildRequires: pkgconfig(libssh2) >= 1.6.0
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
%if 0%{?rhel} <= 7
|
||||
%global python python2
|
||||
%else
|
||||
%global python /usr/libexec/platform-python
|
||||
%endif
|
||||
%else
|
||||
%global python python3
|
||||
%endif
|
||||
BuildRequires: %{python}
|
||||
|
||||
%if %with bundled_llvm
|
||||
BuildRequires: cmake3 >= 3.4.3
|
||||
Provides: bundled(llvm) = 9.0.1
|
||||
%else
|
||||
BuildRequires: cmake >= 2.8.11
|
||||
%if 0%{?epel}
|
||||
%global llvm llvm9.0
|
||||
%endif
|
||||
%if %defined llvm
|
||||
%global llvm_root %{_libdir}/%{llvm}
|
||||
%else
|
||||
%global llvm llvm
|
||||
%global llvm_root %{_prefix}
|
||||
%endif
|
||||
BuildRequires: %{llvm}-devel >= 8.0
|
||||
%if %with llvm_static
|
||||
BuildRequires: %{llvm}-static
|
||||
BuildRequires: libffi-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
|
||||
BuildRequires: procps-ng
|
||||
|
||||
# debuginfo-gdb tests need gdb
|
||||
BuildRequires: gdb
|
||||
|
||||
# TODO: work on unbundling these!
|
||||
Provides: bundled(libbacktrace) = 1.0.20200219
|
||||
|
||||
# Virtual provides for folks who attempt "dnf install rustc"
|
||||
Provides: rustc = %{version}-%{release}
|
||||
Provides: rustc%{?_isa} = %{version}-%{release}
|
||||
|
||||
# Always require our exact standard library
|
||||
Requires: %{name}-std-static%{?_isa} = %{version}-%{release}
|
||||
|
||||
# The C compiler is needed at runtime just for linking. Someday rustc might
|
||||
# invoke the linker directly, and then we'll only need binutils.
|
||||
# https://github.com/rust-lang/rust/issues/11937
|
||||
Requires: /usr/bin/cc
|
||||
|
||||
# ALL Rust libraries are private, because they don't keep an ABI.
|
||||
%global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.*
|
||||
%global __provides_exclude ^(%{_privatelibs})$
|
||||
%global __requires_exclude ^(%{_privatelibs})$
|
||||
%global __provides_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$
|
||||
%global __requires_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$
|
||||
|
||||
# While we don't want to encourage dynamic linking to Rust shared libraries, as
|
||||
# there's no stable ABI, we still need the unallocated metadata (.rustc) to
|
||||
# support custom-derive plugins like #[proc_macro_derive(Foo)]. But eu-strip is
|
||||
# very eager by default, so we have to limit it to -g, only debugging symbols.
|
||||
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
|
||||
# Newer find-debuginfo.sh supports --keep-section, which is preferable. rhbz1465997
|
||||
%global _find_debuginfo_opts --keep-section .rustc
|
||||
%else
|
||||
%global _find_debuginfo_opts -g
|
||||
%undefine _include_minidebuginfo
|
||||
%endif
|
||||
|
||||
# Use hardening ldflags.
|
||||
%global rustflags -Clink-arg=-Wl,-z,relro,-z,now
|
||||
|
||||
%if %{without bundled_llvm}
|
||||
%if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1}
|
||||
%global llvm_has_filecheck 1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
Rust is a systems programming language that runs blazingly fast, prevents
|
||||
segfaults, and guarantees thread safety.
|
||||
|
||||
This package includes the Rust compiler and documentation generator.
|
||||
|
||||
|
||||
%package std-static
|
||||
Summary: Standard library for Rust
|
||||
|
||||
%description std-static
|
||||
This package includes the standard libraries for building applications
|
||||
written in Rust.
|
||||
|
||||
|
||||
%package debugger-common
|
||||
Summary: Common debugger pretty printers for Rust
|
||||
BuildArch: noarch
|
||||
|
||||
%description debugger-common
|
||||
This package includes the common functionality for %{name}-gdb and %{name}-lldb.
|
||||
|
||||
|
||||
%package gdb
|
||||
Summary: GDB pretty printers for Rust
|
||||
BuildArch: noarch
|
||||
Requires: gdb
|
||||
Requires: %{name}-debugger-common = %{version}-%{release}
|
||||
|
||||
%description gdb
|
||||
This package includes the rust-gdb script, which allows easier debugging of Rust
|
||||
programs.
|
||||
|
||||
|
||||
%if %with lldb
|
||||
|
||||
%package lldb
|
||||
Summary: LLDB pretty printers for Rust
|
||||
BuildArch: noarch
|
||||
Requires: lldb
|
||||
%if 0%{?fedora} >= 31 || 0%{?rhel} > 7
|
||||
Requires: python3-lldb
|
||||
%else
|
||||
Requires: python2-lldb
|
||||
%endif
|
||||
Requires: %{name}-debugger-common = %{version}-%{release}
|
||||
|
||||
%description lldb
|
||||
This package includes the rust-lldb script, which allows easier debugging of Rust
|
||||
programs.
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for Rust
|
||||
# NOT BuildArch: noarch
|
||||
# Note, while docs are mostly noarch, some things do vary by target_arch.
|
||||
# Koji will fail the build in rpmdiff if two architectures build a noarch
|
||||
# subpackage differently, so instead we have to keep its arch.
|
||||
|
||||
%description doc
|
||||
This package includes HTML documentation for the Rust programming language and
|
||||
its standard library.
|
||||
|
||||
|
||||
%package -n cargo
|
||||
Summary: Rust's package manager and build tool
|
||||
%if %with bundled_libgit2
|
||||
Provides: bundled(libgit2) = 1.0.0
|
||||
%endif
|
||||
%if %with bundled_libssh2
|
||||
Provides: bundled(libssh2) = 1.9.0~dev
|
||||
%endif
|
||||
# For tests:
|
||||
BuildRequires: git
|
||||
# Cargo is not much use without Rust
|
||||
Requires: rust
|
||||
|
||||
# "cargo vendor" is a builtin command starting with 1.37. The Obsoletes and
|
||||
# Provides are mostly relevant to RHEL, but harmless to have on Fedora/etc. too
|
||||
Obsoletes: cargo-vendor <= 0.1.23
|
||||
Provides: cargo-vendor = %{version}-%{release}
|
||||
|
||||
%description -n cargo
|
||||
Cargo is a tool that allows Rust projects to declare their various dependencies
|
||||
and ensure that you'll always get a repeatable build.
|
||||
|
||||
|
||||
%package -n cargo-doc
|
||||
Summary: Documentation for Cargo
|
||||
BuildArch: noarch
|
||||
# Cargo no longer builds its own documentation
|
||||
# https://github.com/rust-lang/cargo/pull/4904
|
||||
Requires: rust-doc = %{version}-%{release}
|
||||
|
||||
%description -n cargo-doc
|
||||
This package includes HTML documentation for Cargo.
|
||||
|
||||
|
||||
%package -n rustfmt
|
||||
Summary: Tool to find and fix Rust formatting issues
|
||||
Requires: cargo
|
||||
|
||||
# The component/package was rustfmt-preview until Rust 1.31.
|
||||
Obsoletes: rustfmt-preview < 1.0.0
|
||||
Provides: rustfmt-preview = %{version}-%{release}
|
||||
|
||||
%description -n rustfmt
|
||||
A tool for formatting Rust code according to style guidelines.
|
||||
|
||||
|
||||
%package -n rls
|
||||
Summary: Rust Language Server for IDE integration
|
||||
%if %with bundled_libgit2
|
||||
Provides: bundled(libgit2) = 1.0.0
|
||||
%endif
|
||||
%if %with bundled_libssh2
|
||||
Provides: bundled(libssh2) = 1.9.0~dev
|
||||
%endif
|
||||
Requires: rust-analysis
|
||||
# /usr/bin/rls is dynamically linked against internal rustc libs
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
# The component/package was rls-preview until Rust 1.31.
|
||||
Obsoletes: rls-preview < 1.31.6
|
||||
Provides: rls-preview = %{version}-%{release}
|
||||
|
||||
%description -n rls
|
||||
The Rust Language Server provides a server that runs in the background,
|
||||
providing IDEs, editors, and other tools with information about Rust programs.
|
||||
It supports functionality such as 'goto definition', symbol search,
|
||||
reformatting, and code completion, and enables renaming and refactorings.
|
||||
|
||||
|
||||
%package -n clippy
|
||||
Summary: Lints to catch common mistakes and improve your Rust code
|
||||
Requires: cargo
|
||||
# /usr/bin/clippy-driver is dynamically linked against internal rustc libs
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
# The component/package was clippy-preview until Rust 1.31.
|
||||
Obsoletes: clippy-preview <= 0.0.212
|
||||
Provides: clippy-preview = %{version}-%{release}
|
||||
|
||||
%description -n clippy
|
||||
A collection of lints to catch common mistakes and improve your Rust code.
|
||||
|
||||
|
||||
%package src
|
||||
Summary: Sources for the Rust standard library
|
||||
BuildArch: noarch
|
||||
|
||||
%description src
|
||||
This package includes source files for the Rust standard library. It may be
|
||||
useful as a reference for code completion tools in various editors.
|
||||
|
||||
|
||||
%package analysis
|
||||
Summary: Compiler analysis data for the Rust standard library
|
||||
Requires: rust-std-static%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description analysis
|
||||
This package contains analysis data files produced with rustc's -Zsave-analysis
|
||||
feature for the Rust standard library. The RLS (Rust Language Server) uses this
|
||||
data to provide information about the Rust standard library.
|
||||
|
||||
|
||||
%prep
|
||||
|
||||
%ifarch %{bootstrap_arches}
|
||||
%setup -q -n %{bootstrap_root} -T -b %{bootstrap_source}
|
||||
./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
|
||||
--prefix=%{local_rust_root} --disable-ldconfig
|
||||
test -f '%{local_rust_root}/bin/cargo'
|
||||
test -f '%{local_rust_root}/bin/rustc'
|
||||
%endif
|
||||
|
||||
%setup -q -n %{rustc_package}
|
||||
|
||||
%patch1 -p1
|
||||
|
||||
%if %with disabled_libssh2
|
||||
%patch10 -p1
|
||||
%endif
|
||||
|
||||
%if "%{python}" != "python2"
|
||||
sed -i.try-py3 -e '/try python2.7/i try %{python} "$@"' ./configure
|
||||
%endif
|
||||
|
||||
%if %without bundled_llvm
|
||||
rm -rf src/llvm-project/
|
||||
%endif
|
||||
|
||||
# Remove other unused vendored libraries
|
||||
rm -rf vendor/curl-sys/curl/
|
||||
rm -rf vendor/jemalloc-sys/jemalloc/
|
||||
rm -rf vendor/libz-sys/src/zlib/
|
||||
rm -rf vendor/lzma-sys/xz-*/
|
||||
rm -rf vendor/openssl-src/openssl/
|
||||
|
||||
%if %without bundled_libgit2
|
||||
rm -rf vendor/libgit2-sys/libgit2/
|
||||
%endif
|
||||
|
||||
%if %without bundled_libssh2
|
||||
rm -rf vendor/libssh2-sys/libssh2/
|
||||
%endif
|
||||
%if %with disabled_libssh2
|
||||
rm -rf vendor/libssh2-sys/
|
||||
%endif
|
||||
|
||||
# This only affects the transient rust-installer, but let it use our dynamic xz-libs
|
||||
sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs
|
||||
|
||||
# rename bundled license for packaging
|
||||
cp -a vendor/backtrace-sys/src/libbacktrace/LICENSE{,-libbacktrace}
|
||||
|
||||
%if %{with bundled_llvm} && 0%{?epel}
|
||||
mkdir -p cmake-bin
|
||||
ln -s /usr/bin/cmake3 cmake-bin/cmake
|
||||
%global cmake_path $PWD/cmake-bin
|
||||
%endif
|
||||
|
||||
%if %{without bundled_llvm} && %{with llvm_static}
|
||||
# Static linking to distro LLVM needs to add -lffi
|
||||
# https://github.com/rust-lang/rust/issues/34486
|
||||
sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
|
||||
src/librustc_llvm/lib.rs
|
||||
%endif
|
||||
|
||||
# The configure macro will modify some autoconf-related files, which upsets
|
||||
# cargo when it tries to verify checksums in those files. If we just truncate
|
||||
# that file list, cargo won't have anything to complain about.
|
||||
find vendor -name .cargo-checksum.json \
|
||||
-exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
|
||||
|
||||
# Sometimes Rust sources start with #![...] attributes, and "smart" editors think
|
||||
# it's a shebang and make them executable. Then brp-mangle-shebangs gets upset...
|
||||
find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
|
||||
|
||||
|
||||
%build
|
||||
# This package fails to build with LTO due to undefined symbols. LTO
|
||||
# was disabled in OpenSuSE as well, but with no real explanation why
|
||||
# beyond the undefined symbols. It really should be investigated further.
|
||||
# Disable LTO
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
%if %without bundled_libgit2
|
||||
# convince libgit2-sys to use the distro libgit2
|
||||
export LIBGIT2_SYS_USE_PKG_CONFIG=1
|
||||
%endif
|
||||
|
||||
%if %without bundled_libssh2
|
||||
# convince libssh2-sys to use the distro libssh2
|
||||
export LIBSSH2_SYS_USE_PKG_CONFIG=1
|
||||
%endif
|
||||
|
||||
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
||||
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
|
||||
|
||||
# We're going to override --libdir when configuring to get rustlib into a
|
||||
# common path, but we'll fix the shared libraries during install.
|
||||
%global common_libdir %{_prefix}/lib
|
||||
%global rustlibdir %{common_libdir}/rustlib
|
||||
|
||||
%ifarch %{arm} %{ix86} s390x
|
||||
# full debuginfo is exhausting memory; just do libstd for now
|
||||
# https://github.com/rust-lang/rust/issues/45854
|
||||
%if (0%{?fedora} && 0%{?fedora} < 27) || (0%{?rhel} && 0%{?rhel} <= 7)
|
||||
# Older rpmbuild didn't work with partial debuginfo coverage.
|
||||
%global debug_package %{nil}
|
||||
%define enable_debuginfo --debuginfo-level=0
|
||||
%else
|
||||
%define enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2
|
||||
%endif
|
||||
%else
|
||||
%define enable_debuginfo --debuginfo-level=2
|
||||
%endif
|
||||
|
||||
# We want the best optimization for std, but it caused problems for rpm-ostree
|
||||
# on ppc64le to have all of the compiler_builtins in a single object:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1713090
|
||||
%ifnarch %{power64}
|
||||
%define codegen_units_std --set rust.codegen-units-std=1
|
||||
%endif
|
||||
|
||||
%configure --disable-option-checking \
|
||||
--libdir=%{common_libdir} \
|
||||
--build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
|
||||
--python=%{python} \
|
||||
--local-rust-root=%{local_rust_root} \
|
||||
%{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
|
||||
%{!?llvm_has_filecheck: --disable-codegen-tests} \
|
||||
%{!?with_llvm_static: --enable-llvm-link-shared } } \
|
||||
--disable-rpath \
|
||||
%{enable_debuginfo} \
|
||||
--enable-extended \
|
||||
--enable-vendor \
|
||||
--enable-verbose-tests \
|
||||
%{?codegen_units_std} \
|
||||
--release-channel=%{channel}
|
||||
|
||||
%{python} ./x.py build
|
||||
%{python} ./x.py doc
|
||||
|
||||
|
||||
%install
|
||||
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
||||
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
|
||||
|
||||
DESTDIR=%{buildroot} %{python} ./x.py install
|
||||
|
||||
# Make sure the shared libraries are in the proper libdir
|
||||
%if "%{_libdir}" != "%{common_libdir}"
|
||||
mkdir -p %{buildroot}%{_libdir}
|
||||
find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' \
|
||||
-exec mv -v -t %{buildroot}%{_libdir} '{}' '+'
|
||||
%endif
|
||||
|
||||
# The shared libraries should be executable for debuginfo extraction.
|
||||
find %{buildroot}%{_libdir} -maxdepth 1 -type f -name '*.so' \
|
||||
-exec chmod -v +x '{}' '+'
|
||||
|
||||
# The libdir libraries are identical to those under rustlib/. It's easier on
|
||||
# library loading if we keep them in libdir, but we do need them in rustlib/
|
||||
# to support dynamic linking for compiler plugins, so we'll symlink.
|
||||
(cd "%{buildroot}%{rustlibdir}/%{rust_triple}/lib" &&
|
||||
find ../../../../%{_lib} -maxdepth 1 -name '*.so' |
|
||||
while read lib; do
|
||||
if [ -f "${lib##*/}" ]; then
|
||||
# make sure they're actually identical!
|
||||
cmp "$lib" "${lib##*/}"
|
||||
ln -v -f -s -t . "$lib"
|
||||
fi
|
||||
done)
|
||||
|
||||
# Remove installer artifacts (manifests, uninstall scripts, etc.)
|
||||
find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+'
|
||||
|
||||
# Remove backup files from %%configure munging
|
||||
find %{buildroot}%{rustlibdir} -type f -name '*.orig' -exec rm -v '{}' '+'
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error
|
||||
# We don't actually need to ship any of those python scripts in rust-src anyway.
|
||||
find %{buildroot}%{rustlibdir}/src -type f -name '*.py' -exec rm -v '{}' '+'
|
||||
|
||||
# FIXME: __os_install_post will strip the rlibs
|
||||
# -- should we find a way to preserve debuginfo?
|
||||
|
||||
# Remove unwanted documentation files (we already package them)
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/README.md
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/COPYRIGHT
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/LICENSE
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-APACHE
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-MIT
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-THIRD-PARTY
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/*.old
|
||||
|
||||
# Sanitize the HTML documentation
|
||||
find %{buildroot}%{_docdir}/%{name}/html -empty -delete
|
||||
find %{buildroot}%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+'
|
||||
|
||||
# Create the path for crate-devel packages
|
||||
mkdir -p %{buildroot}%{_datadir}/cargo/registry
|
||||
|
||||
# Cargo no longer builds its own documentation
|
||||
# https://github.com/rust-lang/cargo/pull/4904
|
||||
mkdir -p %{buildroot}%{_docdir}/cargo
|
||||
ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html
|
||||
|
||||
%if %without lldb
|
||||
rm -f %{buildroot}%{_bindir}/rust-lldb
|
||||
rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
|
||||
%endif
|
||||
|
||||
|
||||
%check
|
||||
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
||||
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
|
||||
|
||||
# The results are not stable on koji, so mask errors and just log it.
|
||||
%{python} ./x.py test --no-fail-fast || :
|
||||
%{python} ./x.py test --no-fail-fast cargo || :
|
||||
%{python} ./x.py test --no-fail-fast clippy || :
|
||||
%{python} ./x.py test --no-fail-fast rls || :
|
||||
%{python} ./x.py test --no-fail-fast rustfmt || :
|
||||
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
||||
%files
|
||||
%license COPYRIGHT LICENSE-APACHE LICENSE-MIT
|
||||
%license vendor/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
|
||||
%doc README.md
|
||||
%{_bindir}/rustc
|
||||
%{_bindir}/rustdoc
|
||||
%{_libdir}/*.so
|
||||
%{_mandir}/man1/rustc.1*
|
||||
%{_mandir}/man1/rustdoc.1*
|
||||
%dir %{rustlibdir}
|
||||
%dir %{rustlibdir}/%{rust_triple}
|
||||
%dir %{rustlibdir}/%{rust_triple}/lib
|
||||
%{rustlibdir}/%{rust_triple}/lib/*.so
|
||||
%exclude %{_bindir}/*miri
|
||||
|
||||
|
||||
%files std-static
|
||||
%dir %{rustlibdir}
|
||||
%dir %{rustlibdir}/%{rust_triple}
|
||||
%dir %{rustlibdir}/%{rust_triple}/lib
|
||||
%{rustlibdir}/%{rust_triple}/lib/*.rlib
|
||||
|
||||
|
||||
%files debugger-common
|
||||
%dir %{rustlibdir}
|
||||
%dir %{rustlibdir}/etc
|
||||
%{rustlibdir}/etc/debugger_*.py*
|
||||
|
||||
|
||||
%files gdb
|
||||
%{_bindir}/rust-gdb
|
||||
%{rustlibdir}/etc/gdb_*.py*
|
||||
%exclude %{_bindir}/rust-gdbgui
|
||||
|
||||
|
||||
%if %with lldb
|
||||
%files lldb
|
||||
%{_bindir}/rust-lldb
|
||||
%{rustlibdir}/etc/lldb_*.py*
|
||||
%endif
|
||||
|
||||
|
||||
%files doc
|
||||
%docdir %{_docdir}/%{name}
|
||||
%dir %{_docdir}/%{name}
|
||||
%dir %{_docdir}/%{name}/html
|
||||
%{_docdir}/%{name}/html/*/
|
||||
%{_docdir}/%{name}/html/*.html
|
||||
%{_docdir}/%{name}/html/*.css
|
||||
%{_docdir}/%{name}/html/*.ico
|
||||
%{_docdir}/%{name}/html/*.js
|
||||
%{_docdir}/%{name}/html/*.png
|
||||
%{_docdir}/%{name}/html/*.svg
|
||||
%{_docdir}/%{name}/html/*.woff
|
||||
%license %{_docdir}/%{name}/html/*.txt
|
||||
%license %{_docdir}/%{name}/html/*.md
|
||||
|
||||
|
||||
%files -n cargo
|
||||
%license src/tools/cargo/LICENSE-APACHE src/tools/cargo/LICENSE-MIT src/tools/cargo/LICENSE-THIRD-PARTY
|
||||
%doc src/tools/cargo/README.md
|
||||
%{_bindir}/cargo
|
||||
%{_mandir}/man1/cargo*.1*
|
||||
%{_sysconfdir}/bash_completion.d/cargo
|
||||
%{_datadir}/zsh/site-functions/_cargo
|
||||
%dir %{_datadir}/cargo
|
||||
%dir %{_datadir}/cargo/registry
|
||||
|
||||
|
||||
%files -n cargo-doc
|
||||
%docdir %{_docdir}/cargo
|
||||
%dir %{_docdir}/cargo
|
||||
%{_docdir}/cargo/html
|
||||
|
||||
|
||||
%files -n rustfmt
|
||||
%{_bindir}/rustfmt
|
||||
%{_bindir}/cargo-fmt
|
||||
%doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
|
||||
%license src/tools/rustfmt/LICENSE-{APACHE,MIT}
|
||||
|
||||
|
||||
%files -n rls
|
||||
%{_bindir}/rls
|
||||
%doc src/tools/rls/{README.md,COPYRIGHT,debugging.md}
|
||||
%license src/tools/rls/LICENSE-{APACHE,MIT}
|
||||
|
||||
|
||||
%files -n clippy
|
||||
%{_bindir}/cargo-clippy
|
||||
%{_bindir}/clippy-driver
|
||||
%doc src/tools/clippy/{README.md,CHANGELOG.md}
|
||||
%license src/tools/clippy/LICENSE-{APACHE,MIT}
|
||||
|
||||
|
||||
%files src
|
||||
%dir %{rustlibdir}
|
||||
%{rustlibdir}/src
|
||||
|
||||
|
||||
%files analysis
|
||||
%{rustlibdir}/%{rust_triple}/analysis/
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 14 2020 Josh Stone <jistone@redhat.com> - 1.44.1-1
|
||||
- Update to 1.44.1.
|
||||
|
||||
* Thu May 07 2020 Josh Stone <jistone@redhat.com> - 1.43.1-1
|
||||
- Update to 1.43.1.
|
||||
|
||||
* Thu Apr 23 2020 Josh Stone <jistone@redhat.com> - 1.43.0-1
|
||||
- Update to 1.43.0.
|
||||
|
||||
* Thu Mar 12 2020 Josh Stone <jistone@redhat.com> - 1.42.0-1
|
||||
- Update to 1.42.0.
|
||||
|
||||
* Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 1.41.1-1
|
||||
- Update to 1.41.1.
|
||||
|
||||
* Thu Jan 30 2020 Josh Stone <jistone@redhat.com> - 1.41.0-1
|
||||
- Update to 1.41.0.
|
||||
|
||||
* Thu Jan 16 2020 Josh Stone <jistone@redhat.com> - 1.40.0-1
|
||||
- Update to 1.40.0.
|
||||
- Fix compiletest with newer (local-rebuild) libtest
|
||||
- Build compiletest with in-tree libtest
|
||||
- Fix ARM EHABI unwinding
|
||||
|
||||
* Tue Nov 12 2019 Josh Stone <jistone@redhat.com> - 1.39.0-2
|
||||
- Fix a couple build and test issues with rustdoc.
|
||||
|
||||
* Thu Nov 07 2019 Josh Stone <jistone@redhat.com> - 1.39.0-1
|
||||
- Update to 1.39.0.
|
||||
|
||||
* Thu Sep 26 2019 Josh Stone <jistone@redhat.com> - 1.38.0-1
|
||||
- Update to 1.38.0.
|
||||
|
||||
* Thu Aug 15 2019 Josh Stone <jistone@redhat.com> - 1.37.0-1
|
||||
- Update to 1.37.0.
|
||||
- Disable libssh2 (git+ssh support).
|
||||
|
||||
* Thu Jul 04 2019 Josh Stone <jistone@redhat.com> - 1.36.0-1
|
||||
- Update to 1.36.0.
|
||||
|
||||
* Wed May 29 2019 Josh Stone <jistone@redhat.com> - 1.35.0-2
|
||||
- Fix compiletest for rebuild testing.
|
||||
|
||||
* Thu May 23 2019 Josh Stone <jistone@redhat.com> - 1.35.0-1
|
||||
- Update to 1.35.0.
|
||||
|
||||
* Tue May 14 2019 Josh Stone <jistone@redhat.com> - 1.34.2-1
|
||||
- Update to 1.34.2 -- fixes CVE-2019-12083.
|
||||
|
||||
* Thu May 09 2019 Josh Stone <jistone@redhat.com> - 1.34.1-1
|
||||
- Update to 1.34.1.
|
||||
|
||||
* Thu Apr 11 2019 Josh Stone <jistone@redhat.com> - 1.34.0-1
|
||||
- Update to 1.34.0.
|
||||
|
||||
* Wed Apr 10 2019 Josh Stone <jistone@redhat.com> - 1.33.0-1
|
||||
- Update to 1.33.0.
|
||||
|
||||
* Tue Apr 09 2019 Josh Stone <jistone@redhat.com> - 1.32.0-1
|
||||
- Update to 1.32.0.
|
||||
|
||||
* Fri Dec 14 2018 Josh Stone <jistone@redhat.com> - 1.31.0-5
|
||||
- Restore rust-lldb.
|
||||
|
||||
* Thu Dec 13 2018 Josh Stone <jistone@redhat.com> - 1.31.0-4
|
||||
- Backport fixes for rls.
|
||||
|
||||
* Thu Dec 13 2018 Josh Stone <jistone@redhat.com> - 1.31.0-3
|
||||
- Update to 1.31.0 -- Rust 2018!
|
||||
- clippy/rls/rustfmt are no longer -preview
|
||||
|
||||
* Wed Dec 12 2018 Josh Stone <jistone@redhat.com> - 1.30.1-2
|
||||
- Update to 1.30.1.
|
||||
|
||||
* Tue Nov 06 2018 Josh Stone <jistone@redhat.com> - 1.29.2-1
|
||||
- Update to 1.29.2.
|
||||
|
||||
* Thu Nov 01 2018 Josh Stone <jistone@redhat.com> - 1.28.0-1
|
||||
- Update to 1.28.0.
|
||||
|
||||
* Thu Nov 01 2018 Josh Stone <jistone@redhat.com> - 1.27.2-1
|
||||
- Update to 1.27.2.
|
||||
|
||||
* Wed Oct 10 2018 Josh Stone <jistone@redhat.com> - 1.26.2-12
|
||||
- Fix "fp" target feature for AArch64 (#1632880)
|
||||
|
||||
* Mon Oct 08 2018 Josh Stone <jistone@redhat.com> - 1.26.2-11
|
||||
- Security fix for str::repeat (pending CVE).
|
||||
|
||||
* Fri Oct 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-10
|
||||
- Rebuild without bootstrap binaries.
|
||||
|
||||
* Thu Oct 04 2018 Josh Stone <jistone@redhat.com> - 1.26.2-9
|
||||
- Bootstrap without SCL packaging. (rhbz1635067)
|
||||
|
||||
* Tue Aug 28 2018 Tom Stellard <tstellar@redhat.com> - 1.26.2-8
|
||||
- Use python3 prefix for lldb Requires
|
||||
|
||||
* Mon Aug 13 2018 Josh Stone <jistone@redhat.com> - 1.26.2-7
|
||||
- Build with platform-python
|
||||
|
||||
* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.26.2-6
|
||||
- Exclude rust-src from auto-requires
|
||||
|
||||
* Thu Aug 02 2018 Josh Stone <jistone@redhat.com> - 1.26.2-5
|
||||
- Rebuild without bootstrap binaries.
|
||||
|
||||
* Tue Jul 31 2018 Josh Stone <jistone@redhat.com> - 1.26.2-4
|
||||
- Bootstrap as a module.
|
||||
|
||||
* Mon Jun 04 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
|
||||
- Update to 1.26.2.
|
||||
|
||||
* Wed May 30 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
|
||||
- Update to 1.26.1.
|
||||
|
||||
* Fri May 18 2018 Josh Stone <jistone@redhat.com> - 1.26.0-1
|
||||
- Update to 1.26.0.
|
||||
|
||||
* Tue Apr 10 2018 Josh Stone <jistone@redhat.com> - 1.25.0-2
|
||||
- Filter codegen-backends from Provides too.
|
||||
|
||||
* Tue Apr 03 2018 Josh Stone <jistone@redhat.com> - 1.25.0-1
|
||||
- Update to 1.25.0.
|
||||
- Add rustfmt-preview as a subpackage.
|
||||
|
||||
* Thu Feb 22 2018 Josh Stone <jistone@redhat.com> - 1.24.0-1
|
||||
- Update to 1.24.0.
|
||||
|
||||
* Tue Jan 16 2018 Josh Stone <jistone@redhat.com> - 1.23.0-2
|
||||
- Rebuild without bootstrap binaries.
|
||||
|
||||
* Mon Jan 15 2018 Josh Stone <jistone@redhat.com> - 1.23.0-1
|
||||
- Bootstrap 1.23 on el8.
|
Loading…
Reference in New Issue
Block a user