diff --git a/.gitignore b/.gitignore index d71d88a..ae43125 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ /rustc-1.14.0-powerpc64-unknown-linux-gnu.tar.gz /rustc-1.14.0-s390x-unknown-linux-gnu.tar.gz /rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz +/rustc-1.15.0-powerpc64-unknown-linux-gnu.tar.gz +/rustc-1.15.0-powerpc64le-unknown-linux-gnu.tar.gz diff --git a/rust.spec b/rust.spec index 018e5b8..df00c27 100644 --- a/rust.spec +++ b/rust.spec @@ -1,7 +1,6 @@ # 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 +%global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x # The channel can be stable, beta, or nightly %{!?channel: %global channel stable} @@ -14,6 +13,14 @@ # Only the specified arches will use bootstrap binaries. #global bootstrap_arches %%{rust_arches} +%global bootstrap_arches ppc64 ppc64le + +# Temporarily override the bootstrap channel for powerpc. The binaries used +# here are also *not* the upstream ones, but rather custom cross-compliations +# by jistone using the newer docker images with ABI changes found here: +# https://github.com/rust-lang/rust/pull/39382 +%global orig_bootstrap_channel %{bootstrap_channel} +%global bootstrap_channel 1.15.0 # We generally don't want llvm-static present at all, since llvm-config will # make us link statically. But we can opt in, e.g. to aid LLVM rebases. @@ -90,7 +97,7 @@ end} %global local_rust_root %{_builddir}/%{bootstrap_root}/rustc Provides: bundled(%{name}-bootstrap) = %{bootstrap_channel} %else -BuildRequires: %{name} >= %{bootstrap_channel} +BuildRequires: %{name} >= %{orig_bootstrap_channel} BuildConflicts: %{name} > %{version} %global local_rust_root %{_prefix} %endif @@ -353,6 +360,7 @@ make check-lite VERBOSE=1 -k || python2 src/etc/check-summary.py tmp/*.log || : - Require rust-rpm-macros for new crate packaging. - Keep shared libraries under rustlib/, only debug-stripped. - Merge and clean up conditionals for epel7. +- Bootstrap ppc64 and ppc64le. * Tue Jan 03 2017 Josh Stone - 1.14.0-1 - Update to 1.14.0. diff --git a/sources b/sources index 519fbb6..2f68732 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (rustc-1.15.1-src.tar.gz) = 10d533b17cf7f92b9dff14b399b5dd0ac8b68284eea072c85ede78a4e4c2c4fce8c781777124c64798057aceb6444535e02e067fd67ba3633c3e828fb4d2d339 +SHA512 (rustc-1.15.0-powerpc64-unknown-linux-gnu.tar.gz) = 5e556a51fbc36b71d68677bd0ad79e35c2168a3a1f0f22550fefbb3a2817c84bdc1540b5dc3b17122a7921928392aa63c475060238abb826d6e243062aadbf7a +SHA512 (rustc-1.15.0-powerpc64le-unknown-linux-gnu.tar.gz) = 6d50d20abec91bf6a35ccbbdb2c6dc2f5e185c70b60826be4db8fcc6f49cde16f9be78035a2fc1777d8c68809aec527b9feae355d6abbea66f101960bb1187e9