Compare commits
84 Commits
rawhide
...
jistone/be
Author | SHA1 | Date |
---|---|---|
Josh Stone | 519c6a9852 | |
Josh Stone | 6732b6b7fb | |
Josh Stone | 86f616623c | |
Josh Stone | 44fe1090f9 | |
Josh Stone | 09f0f09852 | |
Josh Stone | 8429f906ad | |
Josh Stone | c60dd26567 | |
Josh Stone | 785d55c34d | |
Josh Stone | f3956f2ed3 | |
Josh Stone | 966da21ad0 | |
Josh Stone | 1e2b9b2916 | |
Josh Stone | 8e99f8c4a4 | |
Josh Stone | 475b171687 | |
Josh Stone | a848b3b732 | |
Josh Stone | 8ee38f7820 | |
Josh Stone | 332ef61ee2 | |
Josh Stone | c454924baf | |
Josh Stone | c48bc712c8 | |
Josh Stone | 1963761c96 | |
Josh Stone | 39814efda6 | |
Josh Stone | 755e253f63 | |
Josh Stone | f1d7be8f38 | |
Josh Stone | dd5f50a59b | |
Josh Stone | 595faa1874 | |
Josh Stone | 6ca00007e8 | |
Josh Stone | a103b2abf4 | |
Josh Stone | 3e79b5e2c3 | |
Josh Stone | 4d9af19061 | |
Josh Stone | be69cb21f2 | |
Josh Stone | cab102f808 | |
Josh Stone | d201a25c94 | |
Josh Stone | 4f5c2bcd74 | |
Josh Stone | 6af1fde79b | |
Josh Stone | 2f05e496e5 | |
Josh Stone | 7472b1ea49 | |
Josh Stone | 381017845f | |
Josh Stone | aa84a97bfc | |
Josh Stone | 9d2418db76 | |
Josh Stone | 7826701957 | |
Josh Stone | fe90904f28 | |
Josh Stone | a55bbef495 | |
Josh Stone | 8b950ace9c | |
Josh Stone | e045a7bf20 | |
Josh Stone | 5da6ebf9a5 | |
Josh Stone | 690bb66d7d | |
Josh Stone | c580c46578 | |
Josh Stone | bf789ae20b | |
Josh Stone | 01f9f4f8d7 | |
Josh Stone | 7fe47101e0 | |
Josh Stone | 9731a9fcfa | |
Josh Stone | 2581f83cc5 | |
Josh Stone | 6006123daf | |
Josh Stone | 8a1b41eaf9 | |
Josh Stone | d64fb6367a | |
Josh Stone | 43b687ef4b | |
Josh Stone | 68c6023eac | |
Josh Stone | 84c02283ad | |
Josh Stone | 688aed533e | |
Josh Stone | 44e5fa40db | |
Josh Stone | 24b87e1c67 | |
Josh Stone | bfac8ec0d4 | |
Josh Stone | 27cc11db97 | |
Josh Stone | 8c4c8be2a9 | |
Josh Stone | dba382a9de | |
Josh Stone | 0e0e5eedcd | |
Josh Stone | 9f8aa3b200 | |
Josh Stone | ef8535c580 | |
Josh Stone | 5bedf01656 | |
Josh Stone | d40ed5c13c | |
Josh Stone | 95a5ba4a8e | |
Josh Stone | 3c6c44f0de | |
Josh Stone | 17dc2f4612 | |
Josh Stone | 92998165ad | |
Josh Stone | 4f37df8720 | |
Josh Stone | ed2201a8a9 | |
Josh Stone | 1dfccb7e3f | |
Josh Stone | 91ea22b352 | |
Josh Stone | 834370220b | |
Josh Stone | fc762c468c | |
Josh Stone | 84f1424083 | |
Josh Stone | 6f33322c7a | |
Josh Stone | 71ab56b39b | |
Josh Stone | ccef3d28be | |
Josh Stone | d59c1edc2b |
25
rust.spec
25
rust.spec
|
@ -3,16 +3,16 @@
|
||||||
%global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
|
%global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
|
||||||
|
|
||||||
# The channel can be stable, beta, or nightly
|
# The channel can be stable, beta, or nightly
|
||||||
%{!?channel: %global channel stable}
|
%{!?channel: %global channel beta}
|
||||||
|
|
||||||
# To bootstrap from scratch, set the channel and date from src/stage0.txt
|
# 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
|
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
|
||||||
# or nightly wants some beta-YYYY-MM-DD
|
# or nightly wants some beta-YYYY-MM-DD
|
||||||
# Note that cargo matches the program version here, not its crate version.
|
# Note that cargo matches the program version here, not its crate version.
|
||||||
%global bootstrap_rust 1.49.0
|
%global bootstrap_rust 1.50.0
|
||||||
%global bootstrap_cargo 1.49.0
|
%global bootstrap_cargo 1.50.0
|
||||||
%global bootstrap_channel 1.49.0
|
%global bootstrap_channel 1.50.0
|
||||||
%global bootstrap_date 2020-12-31
|
%global bootstrap_date 2021-02-11
|
||||||
|
|
||||||
# Only the specified arches will use bootstrap binaries.
|
# Only the specified arches will use bootstrap binaries.
|
||||||
#global bootstrap_arches %%{rust_arches}
|
#global bootstrap_arches %%{rust_arches}
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: rust
|
Name: rust
|
||||||
Version: 1.50.0
|
Version: 1.51.0~beta.8
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The Rust Programming Language
|
Summary: The Rust Programming Language
|
||||||
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
||||||
|
@ -78,11 +78,11 @@ Patch100: rustc-1.48.0-disable-libssh2.patch
|
||||||
|
|
||||||
# libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
|
# libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
|
||||||
# will try to build it statically -- instead we turn off the feature.
|
# will try to build it statically -- instead we turn off the feature.
|
||||||
Patch101: rustc-1.49.0-disable-http2.patch
|
Patch101: rustc-1.51.0-disable-http2.patch
|
||||||
|
|
||||||
# kernel rh1410097 causes too-small stacks for PIE.
|
# kernel rh1410097 causes too-small stacks for PIE.
|
||||||
# (affects RHEL6 kernels when building for RHEL7)
|
# (affects RHEL6 kernels when building for RHEL7)
|
||||||
Patch102: rustc-1.48.0-no-default-pie.patch
|
Patch102: rustc-1.51.0-no-default-pie.patch
|
||||||
|
|
||||||
|
|
||||||
# Get the Rust triple for any arch.
|
# Get the Rust triple for any arch.
|
||||||
|
@ -165,12 +165,16 @@ BuildRequires: %{python}
|
||||||
|
|
||||||
%if %with bundled_llvm
|
%if %with bundled_llvm
|
||||||
BuildRequires: cmake3 >= 3.4.3
|
BuildRequires: cmake3 >= 3.4.3
|
||||||
Provides: bundled(llvm) = 11.0.0
|
Provides: bundled(llvm) = 11.0.1
|
||||||
%else
|
%else
|
||||||
BuildRequires: cmake >= 2.8.11
|
BuildRequires: cmake >= 2.8.11
|
||||||
%if 0%{?epel} == 7
|
%if 0%{?epel} == 7
|
||||||
%global llvm llvm9.0
|
%global llvm llvm9.0
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?fedora} >= 34
|
||||||
|
# we're not ready for llvm-12 yet
|
||||||
|
%global llvm llvm11
|
||||||
|
%endif
|
||||||
%if %defined llvm
|
%if %defined llvm
|
||||||
%global llvm_root %{_libdir}/%{llvm}
|
%global llvm_root %{_libdir}/%{llvm}
|
||||||
%else
|
%else
|
||||||
|
@ -731,6 +735,9 @@ export %{rust_env}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 19 2021 Josh Stone <jistone@redhat.com> - 1.51.0~beta.8-1
|
||||||
|
- beta test
|
||||||
|
|
||||||
* Thu Feb 11 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
|
* Thu Feb 11 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
|
||||||
- Update to 1.50.0.
|
- Update to 1.50.0.
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- rustc-1.49.0-src/Cargo.lock.orig 2021-01-05 12:45:10.456414612 -0800
|
--- rustc-beta-src/Cargo.lock.orig 2021-03-09 10:30:08.626424998 -0800
|
||||||
+++ rustc-1.49.0-src/Cargo.lock 2021-01-05 12:45:10.458414575 -0800
|
+++ rustc-beta-src/Cargo.lock 2021-03-09 10:32:38.096207704 -0800
|
||||||
@@ -882,7 +882,6 @@
|
@@ -899,7 +899,6 @@
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"libc",
|
"libc",
|
||||||
|
@ -8,7 +8,7 @@
|
||||||
"libz-sys",
|
"libz-sys",
|
||||||
"openssl-sys",
|
"openssl-sys",
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
@@ -1728,16 +1727,6 @@
|
@@ -1860,16 +1859,6 @@
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
@ -25,10 +25,10 @@
|
||||||
name = "libz-sys"
|
name = "libz-sys"
|
||||||
version = "1.1.2"
|
version = "1.1.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
--- rustc-1.49.0-src/src/tools/cargo/Cargo.toml.orig 2021-01-05 12:45:10.458414575 -0800
|
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2021-03-05 08:34:15.000000000 -0800
|
||||||
+++ rustc-1.49.0-src/src/tools/cargo/Cargo.toml 2021-01-05 12:47:25.966928554 -0800
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2021-03-09 10:32:38.096207704 -0800
|
||||||
@@ -25,7 +25,7 @@
|
@@ -25,7 +25,7 @@
|
||||||
crates-io = { path = "crates/crates-io", version = "0.31.1" }
|
crates-io = { path = "crates/crates-io", version = "0.33.0" }
|
||||||
crossbeam-utils = "0.8"
|
crossbeam-utils = "0.8"
|
||||||
crypto-hash = "0.3.1"
|
crypto-hash = "0.3.1"
|
||||||
-curl = { version = "0.4.23", features = ["http2"] }
|
-curl = { version = "0.4.23", features = ["http2"] }
|
||||||
|
@ -36,9 +36,9 @@
|
||||||
curl-sys = "0.4.22"
|
curl-sys = "0.4.22"
|
||||||
env_logger = "0.8.1"
|
env_logger = "0.8.1"
|
||||||
pretty_env_logger = { version = "0.4", optional = true }
|
pretty_env_logger = { version = "0.4", optional = true }
|
||||||
--- rustc-1.49.0-src/src/tools/cargo/src/cargo/core/package.rs.orig 2020-12-28 19:03:25.000000000 -0800
|
--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2021-03-05 08:34:15.000000000 -0800
|
||||||
+++ rustc-1.49.0-src/src/tools/cargo/src/cargo/core/package.rs 2021-01-05 12:45:10.458414575 -0800
|
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2021-03-09 10:32:38.096207704 -0800
|
||||||
@@ -408,14 +408,8 @@
|
@@ -412,14 +412,8 @@
|
||||||
// Also note that pipelining is disabled as curl authors have indicated
|
// Also note that pipelining is disabled as curl authors have indicated
|
||||||
// that it's buggy, and we've empirically seen that it's buggy with HTTP
|
// that it's buggy, and we've empirically seen that it's buggy with HTTP
|
||||||
// proxies.
|
// proxies.
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
|
|
||||||
Ok(PackageSet {
|
Ok(PackageSet {
|
||||||
packages: package_ids
|
packages: package_ids
|
||||||
@@ -584,7 +578,7 @@
|
@@ -592,7 +586,7 @@
|
||||||
macro_rules! try_old_curl {
|
macro_rules! try_old_curl {
|
||||||
($e:expr, $msg:expr) => {
|
($e:expr, $msg:expr) => {
|
||||||
let result = $e;
|
let result = $e;
|
|
@ -1,14 +1,15 @@
|
||||||
--- rustc-1.48.0-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig 2020-11-16 06:01:53.000000000 -0800
|
--- rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig 2021-03-09 10:40:09.755485845 -0800
|
||||||
+++ rustc-1.48.0-src/compiler/rustc_codegen_ssa/src/back/link.rs 2020-11-16 09:37:15.779516797 -0800
|
+++ rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs 2021-03-09 10:44:51.257426181 -0800
|
||||||
@@ -1185,10 +1185,12 @@
|
@@ -1279,11 +1279,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
|
fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
|
||||||
- let kind = match (crate_type, sess.crt_static(Some(crate_type)), sess.relocation_model()) {
|
- let kind = match (crate_type, sess.crt_static(Some(crate_type)), sess.relocation_model()) {
|
||||||
- (CrateType::Executable, false, RelocModel::Pic) => LinkOutputKind::DynamicPicExe,
|
|
||||||
+ // Only use PIE if explicity specified.
|
+ // Only use PIE if explicity specified.
|
||||||
+ let explicit_pic = matches!(sess.opts.cg.relocation_model, Some(RelocModel::Pic));
|
+ let explicit_pic = matches!(sess.opts.cg.relocation_model, Some(RelocModel::Pic));
|
||||||
+ let kind = match (crate_type, sess.crt_static(Some(crate_type)), explicit_pic) {
|
+ let kind = match (crate_type, sess.crt_static(Some(crate_type)), explicit_pic) {
|
||||||
|
(CrateType::Executable, _, _) if sess.is_wasi_reactor() => LinkOutputKind::WasiReactorExe,
|
||||||
|
- (CrateType::Executable, false, RelocModel::Pic) => LinkOutputKind::DynamicPicExe,
|
||||||
+ (CrateType::Executable, false, true) => LinkOutputKind::DynamicPicExe,
|
+ (CrateType::Executable, false, true) => LinkOutputKind::DynamicPicExe,
|
||||||
(CrateType::Executable, false, _) => LinkOutputKind::DynamicNoPicExe,
|
(CrateType::Executable, false, _) => LinkOutputKind::DynamicNoPicExe,
|
||||||
- (CrateType::Executable, true, RelocModel::Pic) => LinkOutputKind::StaticPicExe,
|
- (CrateType::Executable, true, RelocModel::Pic) => LinkOutputKind::StaticPicExe,
|
Loading…
Reference in New Issue