From a0c80ef2d6dd3ea02aae0689dab48e470e76db0a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 05 2019 19:43:46 +0000 Subject: import rust-1.37.0-1.module+el8.1.0+3987+3eb6e0a5 --- diff --git a/.gitignore b/.gitignore index 574a930..b535771 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rustc-1.35.0-src.tar.xz +SOURCES/rustc-1.37.0-src.tar.xz diff --git a/.rust.metadata b/.rust.metadata index 9748f36..ccd2a88 100644 --- a/.rust.metadata +++ b/.rust.metadata @@ -1 +1 @@ -50cece3a9a40909c1042344e380e50681365e808 SOURCES/rustc-1.35.0-src.tar.xz +cc02fc6f35e30153f58df3dcea4dcdf148b6194c SOURCES/rustc-1.37.0-src.tar.xz diff --git a/SOURCES/0001-Limit-internalization-in-LLVM-8-ThinLTO.patch b/SOURCES/0001-Limit-internalization-in-LLVM-8-ThinLTO.patch deleted file mode 100644 index 3c09947..0000000 --- a/SOURCES/0001-Limit-internalization-in-LLVM-8-ThinLTO.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b4131e297e18fde119f6f461b3e622218166b009 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Fri, 26 Apr 2019 08:58:14 -0700 -Subject: [PATCH] Limit internalization in LLVM 8 ThinLTO - ---- - src/rustllvm/PassWrapper.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp -index 319c66a21f17..0ebef82d3768 100644 ---- a/src/rustllvm/PassWrapper.cpp -+++ b/src/rustllvm/PassWrapper.cpp -@@ -873,8 +873,11 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules, - return PrevailingType::Unknown; - }; - #if LLVM_VERSION_GE(8, 0) -+ // We don't have a complete picture in our use of ThinLTO, just our immediate -+ // crate, so we need `ImportEnabled = false` to limit internalization. -+ // Otherwise, we sometimes lose `static` values -- see #60184. - computeDeadSymbolsWithConstProp(Ret->Index, Ret->GUIDPreservedSymbols, -- deadIsPrevailing, /* ImportEnabled = */ true); -+ deadIsPrevailing, /* ImportEnabled = */ false); - #else - computeDeadSymbols(Ret->Index, Ret->GUIDPreservedSymbols, deadIsPrevailing); - #endif --- -2.20.1 - diff --git a/SOURCES/0001-bump-bootstrap-fix-compiletest-wrt.-exclude_should_p.patch b/SOURCES/0001-bump-bootstrap-fix-compiletest-wrt.-exclude_should_p.patch deleted file mode 100644 index 7ab3801..0000000 --- a/SOURCES/0001-bump-bootstrap-fix-compiletest-wrt.-exclude_should_p.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 26e9a81c487f63c734bb7ac1739cdae2da2cb9b1 Mon Sep 17 00:00:00 2001 -From: Mazdak Farrokhzad -Date: Mon, 15 Apr 2019 04:05:37 +0200 -Subject: [PATCH] bump bootstrap; fix compiletest wrt. exclude_should_panic - ---- - src/tools/compiletest/src/main.rs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs -index 9e3c49119dea..431fd7969be0 100644 ---- a/src/tools/compiletest/src/main.rs -+++ b/src/tools/compiletest/src/main.rs -@@ -523,6 +523,7 @@ pub fn run_tests(config: &Config) { - - pub fn test_opts(config: &Config) -> test::TestOpts { - test::TestOpts { -+ exclude_should_panic: false, - filter: config.filter.clone(), - filter_exact: config.filter_exact, - run_ignored: if config.run_ignored { --- -2.21.0 - diff --git a/SOURCES/rust-pr61085-fix-ICE-with-incorrect-turbofish.patch b/SOURCES/rust-pr61085-fix-ICE-with-incorrect-turbofish.patch deleted file mode 100644 index 9929aaa..0000000 --- a/SOURCES/rust-pr61085-fix-ICE-with-incorrect-turbofish.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 476732995c2f5dc08e20eb8f9f03c628a48f5f41 Mon Sep 17 00:00:00 2001 -From: Oliver Scherer -Date: Thu, 23 May 2019 17:05:48 +0200 -Subject: [PATCH 1/3] WIP - ---- - src/librustc_typeck/check/mod.rs | 22 +++++++++++----------- - src/test/run-pass/issue-60989.rs | 4 ++++ - 2 files changed, 15 insertions(+), 11 deletions(-) - create mode 100644 src/test/run-pass/issue-60989.rs - -diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs -index 313ed19b945d..088729f12b1e 100644 ---- a/src/librustc_typeck/check/mod.rs -+++ b/src/librustc_typeck/check/mod.rs -@@ -5396,17 +5396,6 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { - - let tcx = self.tcx; - -- match def { -- Def::Local(nid) | Def::Upvar(nid, ..) => { -- let hid = self.tcx.hir().node_to_hir_id(nid); -- let ty = self.local_ty(span, hid).decl_ty; -- let ty = self.normalize_associated_types_in(span, &ty); -- self.write_ty(hir_id, ty); -- return (ty, def); -- } -- _ => {} -- } -- - let (def, def_id, ty) = self.rewrite_self_ctor(def, span); - let path_segs = AstConv::def_ids_for_path_segments(self, segments, self_ty, def); - -@@ -5469,6 +5458,17 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { - user_self_ty = None; - } - -+ match def { -+ Def::Local(nid) | Def::Upvar(nid, ..) => { -+ let hid = self.tcx.hir().node_to_hir_id(nid); -+ let ty = self.local_ty(span, hid).decl_ty; -+ let ty = self.normalize_associated_types_in(span, &ty); -+ self.write_ty(hir_id, ty); -+ return (ty, def); -+ } -+ _ => {} -+ } -+ - // Now we have to compare the types that the user *actually* - // provided against the types that were *expected*. If the user - // did not provide any types, then we want to substitute inference -diff --git a/src/test/run-pass/issue-60989.rs b/src/test/run-pass/issue-60989.rs -new file mode 100644 -index 000000000000..efaa74da3baa ---- /dev/null -+++ b/src/test/run-pass/issue-60989.rs -@@ -0,0 +1,4 @@ -+fn main() { -+ let c1 = (); -+ c1::<()>; -+} --- -2.21.0 - - -From 97f204e6ae43bfe0fed64221d709a194bef728a4 Mon Sep 17 00:00:00 2001 -From: Oliver Scherer -Date: Thu, 23 May 2019 17:21:32 +0200 -Subject: [PATCH 2/3] Make regression test a compile-fail test - ---- - src/test/{run-pass => compile-fail}/issue-60989.rs | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - rename src/test/{run-pass => compile-fail}/issue-60989.rs (100%) - -diff --git a/src/test/run-pass/issue-60989.rs b/src/test/compile-fail/issue-60989.rs -similarity index 100% -rename from src/test/run-pass/issue-60989.rs -rename to src/test/compile-fail/issue-60989.rs --- -2.21.0 - - -From 6e81f8205a6d47648d086d26e96bf05e962e3715 Mon Sep 17 00:00:00 2001 -From: Eduard-Mihai Burtescu -Date: Thu, 23 May 2019 19:23:00 +0300 -Subject: [PATCH 3/3] rustc_typeck: don't produce a `DefId` or `Ty` from - `rewrite_self_ctor`, only a `Def`. - ---- - src/librustc_typeck/check/mod.rs | 30 ++++++++++++++++++---------- - src/test/compile-fail/issue-60989.rs | 4 ---- - src/test/ui/issue-60989.rs | 18 +++++++++++++++++ - src/test/ui/issue-60989.stderr | 15 ++++++++++++++ - 4 files changed, 52 insertions(+), 15 deletions(-) - delete mode 100644 src/test/compile-fail/issue-60989.rs - create mode 100644 src/test/ui/issue-60989.rs - create mode 100644 src/test/ui/issue-60989.stderr - -diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs -index 088729f12b1e..b6adcdbf35e9 100644 ---- a/src/librustc_typeck/check/mod.rs -+++ b/src/librustc_typeck/check/mod.rs -@@ -5330,7 +5330,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { - } - - // Rewrite `SelfCtor` to `Ctor` -- pub fn rewrite_self_ctor(&self, def: Def, span: Span) -> (Def, DefId, Ty<'tcx>) { -+ pub fn rewrite_self_ctor(&self, def: Def, span: Span) -> Def { - let tcx = self.tcx; - if let Def::SelfCtor(impl_def_id) = def { - let ty = self.impl_self_ty(span, impl_def_id).ty; -@@ -5340,8 +5340,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { - Some(adt_def) if adt_def.has_ctor() => { - let variant = adt_def.non_enum_variant(); - let ctor_def_id = variant.ctor_def_id.unwrap(); -- let def = Def::Ctor(ctor_def_id, CtorOf::Struct, variant.ctor_kind); -- (def, ctor_def_id, tcx.type_of(ctor_def_id)) -+ Def::Ctor(ctor_def_id, CtorOf::Struct, variant.ctor_kind) - } - _ => { - let mut err = tcx.sess.struct_span_err(span, -@@ -5364,16 +5363,11 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { - } - err.emit(); - -- (def, impl_def_id, tcx.types.err) -+ def - } - } - } else { -- let def_id = def.def_id(); -- -- // The things we are substituting into the type should not contain -- // escaping late-bound regions, and nor should the base type scheme. -- let ty = tcx.type_of(def_id); -- (def, def_id, ty) -+ def - } - } - -@@ -5396,7 +5390,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { - - let tcx = self.tcx; - -- let (def, def_id, ty) = self.rewrite_self_ctor(def, span); -+ let def = self.rewrite_self_ctor(def, span); - let path_segs = AstConv::def_ids_for_path_segments(self, segments, self_ty, def); - - let mut user_self_ty = None; -@@ -5501,6 +5495,20 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { - tcx.generics_of(*def_id).has_self - }).unwrap_or(false); - -+ let (def_id, ty) = if let Def::SelfCtor(impl_def_id) = def { -+ // NOTE(eddyb) an error has already been emitted by `rewrite_self_ctor`, -+ // avoid using the wrong type here. This isn't in `rewrite_self_ctor` -+ // itself because that runs too early (see #60989). -+ (impl_def_id, tcx.types.err) -+ } else { -+ let def_id = def.def_id(); -+ -+ // The things we are substituting into the type should not contain -+ // escaping late-bound regions, and nor should the base type scheme. -+ let ty = tcx.type_of(def_id); -+ (def_id, ty) -+ }; -+ - let substs = AstConv::create_substs_for_generic_args( - tcx, - def_id, -diff --git a/src/test/compile-fail/issue-60989.rs b/src/test/compile-fail/issue-60989.rs -deleted file mode 100644 -index efaa74da3baa..000000000000 ---- a/src/test/compile-fail/issue-60989.rs -+++ /dev/null -@@ -1,4 +0,0 @@ --fn main() { -- let c1 = (); -- c1::<()>; --} -diff --git a/src/test/ui/issue-60989.rs b/src/test/ui/issue-60989.rs -new file mode 100644 -index 000000000000..930e98bedce8 ---- /dev/null -+++ b/src/test/ui/issue-60989.rs -@@ -0,0 +1,18 @@ -+struct A {} -+struct B {} -+ -+impl From for B { -+ fn from(a: A) -> B { -+ B{} -+ } -+} -+ -+fn main() { -+ let c1 = (); -+ c1::<()>; -+ //~^ ERROR type arguments are not allowed for this type -+ -+ let c1 = A {}; -+ c1::>; -+ //~^ ERROR type arguments are not allowed for this type -+} -diff --git a/src/test/ui/issue-60989.stderr b/src/test/ui/issue-60989.stderr -new file mode 100644 -index 000000000000..55a0b9626df7 ---- /dev/null -+++ b/src/test/ui/issue-60989.stderr -@@ -0,0 +1,15 @@ -+error[E0109]: type arguments are not allowed for this type -+ --> $DIR/issue-60989.rs:12:10 -+ | -+LL | c1::<()>; -+ | ^^ type argument not allowed -+ -+error[E0109]: type arguments are not allowed for this type -+ --> $DIR/issue-60989.rs:16:10 -+ | -+LL | c1::>; -+ | ^^^^^^^ type argument not allowed -+ -+error: aborting due to 2 previous errors -+ -+For more information about this error, try `rustc --explain E0109`. --- -2.21.0 - diff --git a/SOURCES/rustc-1.37.0-disable-libssh2.patch b/SOURCES/rustc-1.37.0-disable-libssh2.patch new file mode 100644 index 0000000..19d0344 --- /dev/null +++ b/SOURCES/rustc-1.37.0-disable-libssh2.patch @@ -0,0 +1,49 @@ +--- rustc-1.37.0-src/vendor/git2/Cargo.toml.orig 2019-08-13 01:30:01.000000000 -0700 ++++ rustc-1.37.0-src/vendor/git2/Cargo.toml 2019-08-15 17:37:31.289703156 -0700 +@@ -55,7 +55,7 @@ version = "3.3.0" + 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"] +--- rustc-1.37.0-src/Cargo.lock.orig 2019-08-12 23:27:22.000000000 -0700 ++++ rustc-1.37.0-src/Cargo.lock 2019-08-15 17:41:11.853193421 -0700 +@@ -1393,7 +1393,6 @@ source = "registry+https://github.com/ru + dependencies = [ + "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1409,19 +1408,6 @@ dependencies = [ + ] + + [[package]] +-name = "libssh2-sys" +-version = "0.2.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- +-[[package]] + name = "libz-sys" + version = "1.0.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -4342,7 +4328,6 @@ source = "registry+https://github.com/ru + "checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6" + "checksum libgit2-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "941a41e23f77323b8c9d2ee118aec9ee39dfc176078c18b4757d3bad049d9ff7" + "checksum libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d75d7966bda4730b722d1eab8e668df445368a24394bae9fc1e8dc0ab3dbe4f4" +-"checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d" + "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" + "checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54" + "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" diff --git a/SPECS/rust.spec b/SPECS/rust.spec index 7e5fd74..7c317b3 100644 --- a/SPECS/rust.spec +++ b/SPECS/rust.spec @@ -1,7 +1,7 @@ # 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 armv7hl aarch64 ppc64le s390x +%global rust_arches x86_64 i686 aarch64 ppc64le s390x # The channel can be stable, beta, or nightly %{!?channel: %global channel stable} @@ -10,10 +10,10 @@ # 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.34.0 -%global bootstrap_cargo 1.34.0 -%global bootstrap_channel 1.34.2 -%global bootstrap_date 2019-05-14 +%global bootstrap_rust 1.36.0 +%global bootstrap_cargo 1.36.0 +%global bootstrap_channel 1.36.0 +%global bootstrap_date 2019-07-04 # Only the specified arches will use bootstrap binaries. #global bootstrap_arches %%{rust_arches} @@ -22,7 +22,7 @@ %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 5.0+. +# is insufficient. Rust currently requires LLVM 6.0+. %if 0%{?rhel} && 0%{?rhel} <= 6 && !0%{?epel} %bcond_without bundled_llvm %else @@ -36,26 +36,21 @@ %bcond_without bundled_libgit2 %if 0%{?rhel} -%bcond_without bundled_libssh2 +%bcond_without disabled_libssh2 %else %bcond_with bundled_libssh2 %endif -# LLDB only works on some architectures -%ifarch %{arm} aarch64 %{ix86} x86_64 # LLDB isn't available everywhere... %if !0%{?rhel} || 0%{?rhel} > 7 %bcond_without lldb %else %bcond_with lldb %endif -%else -%bcond_with lldb -%endif Name: rust -Version: 1.35.0 -Release: 2%{?dist} +Version: 1.37.0 +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) @@ -73,14 +68,8 @@ Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz # We do have the necessary fix in our LLVM 7. Patch1: rust-pr57840-llvm7-debuginfo-variants.patch -# https://github.com/rust-lang/rust/pull/60313 -Patch2: 0001-Limit-internalization-in-LLVM-8-ThinLTO.patch - -# https://github.com/rust-lang/rust/pull/61085 -Patch3: rust-pr61085-fix-ICE-with-incorrect-turbofish.patch - -# https://github.com/rust-lang/rust/pull/59974/commits/26e9a81c487f63c734bb7ac1739cdae2da2cb9b1 -Patch4: 0001-bump-bootstrap-fix-compiletest-wrt.-exclude_should_p.patch +# Disable cargo->libgit2->libssh2, as it's not approved for FIPS (rhbz1732949) +Patch10: rustc-1.37.0-disable-libssh2.patch # Get the Rust triple for any arch. %{lua: function rust_triple(arch) @@ -148,7 +137,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libgit2) >= 0.27 %endif -%if %without bundled_libssh2 +%if %{without disabled_libssh2} && %{without bundled_libssh2} # needs libssh2_userauth_publickey_frommemory BuildRequires: pkgconfig(libssh2) >= 1.6.0 %endif @@ -166,7 +155,7 @@ BuildRequires: %{python} %if %with bundled_llvm BuildRequires: cmake3 >= 3.4.3 -Provides: bundled(llvm) = 8.0.0~svn +Provides: bundled(llvm) = 8.0.0 %else BuildRequires: cmake >= 2.8.11 %if 0%{?epel} @@ -273,12 +262,13 @@ programs. %package lldb Summary: LLDB pretty printers for Rust - -# It could be noarch, but lldb has limited availability -#BuildArch: noarch - +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 @@ -303,7 +293,7 @@ its standard library. %package -n cargo Summary: Rust's package manager and build tool %if %with bundled_libgit2 -Provides: bundled(libgit2) = 0.27 +Provides: bundled(libgit2) = 0.28.2 %endif %if %with bundled_libssh2 Provides: bundled(libssh2) = 1.8.1~dev @@ -313,6 +303,11 @@ 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. @@ -344,7 +339,7 @@ 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) = 0.27 +Provides: bundled(libgit2) = 0.28.2 %endif %if %with bundled_libssh2 Provides: bundled(libssh2) = 1.8.1~dev @@ -410,9 +405,10 @@ test -f '%{local_rust_root}/bin/rustc' %setup -q -n %{rustc_package} %patch1 -p1 -R -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 + +%if %with disabled_libssh2 +%patch10 -p1 +%endif %if "%{python}" != "python2" sed -i.try-py3 -e '/try python2.7/i try %{python} "$@"' ./configure @@ -425,6 +421,27 @@ rm -rf src/llvm-project/ # We never enable emscripten. rm -rf src/llvm-emscripten/ +# 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} @@ -474,12 +491,12 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1 %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 --disable-debuginfo --disable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines +%define enable_debuginfo --debuginfo-level=0 %else -%define enable_debuginfo --enable-debuginfo --enable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines +%define enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2 %endif %else -%define enable_debuginfo --enable-debuginfo --disable-debuginfo-only-std --enable-debuginfo-tools --disable-debuginfo-lines +%define enable_debuginfo --debuginfo-level=2 %endif # We want the best optimization for std, but it caused problems for rpm-ostree @@ -492,6 +509,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1 %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} \ @@ -647,6 +665,7 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %{_docdir}/%{name}/html/*.svg %{_docdir}/%{name}/html/*.woff %license %{_docdir}/%{name}/html/*.txt +%license %{_docdir}/%{name}/html/*.md %files -n cargo @@ -696,6 +715,13 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %changelog +* Thu Aug 15 2019 Josh Stone - 1.37.0-1 +- Update to 1.37.0. +- Disable libssh2 (git+ssh support). + +* Thu Jul 04 2019 Josh Stone - 1.36.0-1 +- Update to 1.36.0. + * Wed May 29 2019 Josh Stone - 1.35.0-2 - Fix compiletest for rebuild testing.