rust package update
Signed-off-by: basebuilder_pel7x64builder0 <basebuilder@powerel.org>master
basebuilder_pel7x64builder0
parent
5d53d9efc2
commit
647447597e
455
SPECS/rust.spec
455
SPECS/rust.spec
|
|
@ -1,75 +1,116 @@
|
|||
# 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
|
||||
|
||||
# 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
|
||||
%bcond_without bootstrap
|
||||
%global bootstrap_channel 1.11.0
|
||||
%global bootstrap_date 2016-08-16
|
||||
%global bootstrap_rust 1.18.0
|
||||
%global bootstrap_cargo 0.19.0
|
||||
%global bootstrap_channel %{bootstrap_rust}
|
||||
%global bootstrap_date 2017-06-08
|
||||
|
||||
# Only the specified arches will use bootstrap binaries.
|
||||
#global bootstrap_arches %%{rust_arches}
|
||||
|
||||
# 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.
|
||||
# FIXME: LLVM 3.9 prefers shared linking now! Which is good, but next time we
|
||||
# *want* static we'll have to force it with "llvm-config --link-static".
|
||||
# See also https://github.com/rust-lang/rust/issues/36854
|
||||
# The new rustbuild accepts `--enable-llvm-link-shared`, else links static.
|
||||
%bcond_with llvm_static
|
||||
|
||||
%if 0%{?rhel}
|
||||
%global _with_bundled_llvm 1
|
||||
%endif
|
||||
# We can also choose to just use Rust's bundled LLVM, in case the system LLVM
|
||||
# is insufficient. Rust currently requires LLVM 3.7+.
|
||||
%if 0%{?rhel} && !0%{?epel}
|
||||
%bcond_without bundled_llvm
|
||||
%else
|
||||
%bcond_with bundled_llvm
|
||||
|
||||
|
||||
# Rust 1.12 metadata is now unallocated data (.rustc), and in theory it should
|
||||
# be fine to strip this entirely, since we don't want to expose Rust's unstable
|
||||
# ABI for linking. However, eu-strip was then clobbering .dynsym when it tried
|
||||
# to remove the rust_metadata symbol referencing .rustc (rhbz1380961).
|
||||
# So for unfixed elfutils, we'll leave .rustc alone and only strip debuginfo.
|
||||
%if 0%{?fedora} < 25
|
||||
%global _find_debuginfo_opts -g
|
||||
%undefine _include_minidebuginfo
|
||||
%endif
|
||||
|
||||
# LLDB only works on some architectures
|
||||
%ifarch %{arm} aarch64 %{ix86} x86_64
|
||||
# LLDB isn't available everywhere...
|
||||
%if !0%{?rhel}
|
||||
%bcond_without lldb
|
||||
%else
|
||||
%bcond_with lldb
|
||||
%endif
|
||||
%else
|
||||
%bcond_with lldb
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
Name: rust
|
||||
Version: 1.12.1
|
||||
Version: 1.19.0
|
||||
Release: 1%{?dist}
|
||||
Summary: The Rust Programming Language
|
||||
License: (ASL 2.0 or MIT) and (BSD and ISC 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}
|
||||
%global rustc_package rustc-%{version}-src
|
||||
%else
|
||||
%global rustc_package rustc-%{channel}
|
||||
%global rustc_package rustc-%{channel}-src
|
||||
%endif
|
||||
Source0: https://static.rust-lang.org/dist/%{rustc_package}-src.tar.gz
|
||||
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
|
||||
|
||||
%if %with bootstrap
|
||||
%global bootstrap_base https://static.rust-lang.org/dist/%{bootstrap_date}/rustc-%{bootstrap_channel}
|
||||
Source1: %{bootstrap_base}-x86_64-unknown-linux-gnu.tar.gz
|
||||
Source2: %{bootstrap_base}-i686-unknown-linux-gnu.tar.gz
|
||||
Source3: %{bootstrap_base}-armv7-unknown-linux-gnueabihf.tar.gz
|
||||
Source4: %{bootstrap_base}-aarch64-unknown-linux-gnu.tar.gz
|
||||
Patch1: rust-1.19.0-43072-stack-guard.patch
|
||||
Patch2: rust-1.19.0-43297-configure-debuginfo.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.gz\n",
|
||||
i, base, rust_triple(arch)))
|
||||
if arch == target_arch then
|
||||
rpm.define("bootstrap_source "..i)
|
||||
end
|
||||
end
|
||||
end}
|
||||
%endif
|
||||
|
||||
# Only x86_64 and i686 are Tier 1 platforms at this time.
|
||||
# https://doc.rust-lang.org/stable/book/getting-started.html#tier-1
|
||||
ExclusiveArch: x86_64 i686 armv7hl aarch64
|
||||
%ifarch armv7hl
|
||||
%global rust_triple armv7-unknown-linux-gnueabihf
|
||||
%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
|
||||
%global rust_triple %{_target_cpu}-unknown-linux-gnu
|
||||
%endif
|
||||
|
||||
# merged for 1.13.0
|
||||
Patch1: rust-pr35814-armv7-no-neon.patch
|
||||
|
||||
# merged for 1.14.0
|
||||
Patch2: rust-pr36933-less-neon-again.patch
|
||||
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: cmake3
|
||||
%else
|
||||
BuildRequires: cmake
|
||||
BuildRequires: cargo >= %{bootstrap_cargo}
|
||||
BuildRequires: %{name} >= %{bootstrap_rust}
|
||||
BuildConflicts: %{name} > %{version}
|
||||
%global local_rust_root %{_prefix}
|
||||
%endif
|
||||
|
||||
BuildRequires: make
|
||||
|
|
@ -80,67 +121,126 @@ BuildRequires: zlib-devel
|
|||
BuildRequires: python2
|
||||
BuildRequires: curl
|
||||
|
||||
%if %with bundled_llvm
|
||||
BuildRequires: cmake3
|
||||
Provides: bundled(llvm) = 3.9
|
||||
%else
|
||||
%if 0%{?epel}
|
||||
%global llvm llvm3.9
|
||||
%global llvm_root %{_libdir}/%{llvm}
|
||||
%else
|
||||
%global llvm llvm
|
||||
%global llvm_root %{_prefix}
|
||||
%endif
|
||||
BuildRequires: %{llvm}-devel >= 3.7
|
||||
%if %with llvm_static
|
||||
BuildRequires: llvm-static
|
||||
BuildRequires: %{llvm}-static
|
||||
BuildRequires: libffi-devel
|
||||
%else
|
||||
# Make sure llvm-config doesn't see it.
|
||||
BuildConflicts: llvm-static
|
||||
BuildConflicts: %{llvm}-static
|
||||
%endif
|
||||
|
||||
%if %with bundled_llvm
|
||||
Provides: bundled(llvm) = 3.8
|
||||
%else
|
||||
BuildRequires: llvm-devel
|
||||
%endif
|
||||
|
||||
|
||||
%if %without bootstrap
|
||||
BuildRequires: %{name} <= %{version}
|
||||
BuildRequires: %{name} >= %{bootstrap_channel}
|
||||
%global local_rust_root %{_prefix}
|
||||
%else
|
||||
%global bootstrap_root rustc-%{bootstrap_channel}-%{rust_triple}
|
||||
%global local_rust_root %{_builddir}/%{rustc_package}/%{bootstrap_root}/rustc
|
||||
%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(hoedown) = 3.0.5
|
||||
Provides: bundled(jquery) = 2.1.4
|
||||
Provides: bundled(libbacktrace) = 6.1.0
|
||||
Provides: bundled(miniz) = 1.14
|
||||
|
||||
# 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: gcc
|
||||
|
||||
# ALL Rust libraries are private, because they don't keep an ABI.
|
||||
%global _privatelibs lib.*-[[:xdigit:]]{8}[.]so.*
|
||||
%global _privatelibs lib.*-[[:xdigit:]]*[.]so.*
|
||||
%global __provides_exclude ^(%{_privatelibs})$
|
||||
%global __requires_exclude ^(%{_privatelibs})$
|
||||
%global __provides_exclude_from ^%{_docdir}/.*$
|
||||
%global __requires_exclude_from ^%{_docdir}/.*$
|
||||
|
||||
# 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.
|
||||
%global _find_debuginfo_opts -g
|
||||
%undefine _include_minidebuginfo
|
||||
|
||||
# Use hardening ldflags.
|
||||
%global rustflags -Clink-arg=-Wl,-z,relro,-z,now
|
||||
|
||||
%if %{without bundled_llvm} && "%{llvm_root}" != "%{_prefix}"
|
||||
# https://github.com/rust-lang/rust/issues/40717
|
||||
%global library_path $(%{llvm_root}/bin/llvm-config --libdir)
|
||||
%endif
|
||||
|
||||
%description
|
||||
Rust is a systems programming language that runs blazingly fast, prevents
|
||||
segfaults, and guarantees thread safety.
|
||||
|
||||
This package includes the Rust compiler, standard library, and documentation
|
||||
generator.
|
||||
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
|
||||
|
||||
# It could be noarch, but lldb has limited availability
|
||||
#BuildArch: noarch
|
||||
|
||||
Requires: lldb
|
||||
Requires: python-lldb
|
||||
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
|
||||
|
|
@ -153,20 +253,17 @@ This package includes HTML documentation for the Rust programming language and
|
|||
its standard library.
|
||||
|
||||
|
||||
# TODO: consider a rust-std package containing .../rustlib/$target
|
||||
# This might allow multilib cross-compilation to work naturally.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{rustc_package}
|
||||
|
||||
%if %with bootstrap
|
||||
find %{sources} -name '%{bootstrap_root}.tar.gz' -exec tar -xvzf '{}' ';'
|
||||
%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
|
||||
|
||||
%patch1 -p1 -b .no-neon
|
||||
%patch2 -p1 -b .less-neon
|
||||
%setup -q -n %{rustc_package}
|
||||
|
||||
# unbundle
|
||||
rm -rf src/jemalloc/
|
||||
|
|
@ -179,101 +276,123 @@ cp src/rt/hoedown/LICENSE src/rt/hoedown/LICENSE-hoedown
|
|||
sed -e '/*\//q' src/libbacktrace/backtrace.h \
|
||||
>src/libbacktrace/LICENSE-libbacktrace
|
||||
|
||||
# rust-gdb has hardcoded SYSROOT/lib -- let's make it noarch
|
||||
sed -i.noarch -e 's#DIRECTORY=".*"#DIRECTORY="%{_datadir}/%{name}/etc"#' \
|
||||
src/etc/rust-gdb
|
||||
|
||||
# These tests assume that alloc_jemalloc is present
|
||||
# https://github.com/rust-lang/rust/issues/35017
|
||||
sed -i.jemalloc -e '1i // ignore-test jemalloc is disabled' \
|
||||
src/test/compile-fail/allocator-dylib-is-system.rs \
|
||||
src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs \
|
||||
src/test/run-pass/allocator-default.rs
|
||||
|
||||
# Fedora's LLVM doesn't support any mips targets -- see "llc -version".
|
||||
# Fixed properly by Rust PR36344, which should be released in 1.13.
|
||||
sed -i.nomips -e '/target=mips/,+1s/^/# unsupported /' \
|
||||
src/test/run-make/atomic-lock-free/Makefile
|
||||
# This tests a problem of exponential growth, which seems to be less-reliably
|
||||
# fixed when running on older LLVM and/or some arches. Just skip it for now.
|
||||
sed -i.ignore -e '1i // ignore-test may still be exponential...' \
|
||||
src/test/run-pass/issue-41696.rs
|
||||
|
||||
%if %without bootstrap
|
||||
# The hardcoded stage0 "lib" is inappropriate when using Fedora's own rustc
|
||||
sed -i.libdir -e '/^HLIB_RELATIVE/s/lib$/$$(CFG_LIBDIR_RELATIVE)/' mk/main.mk
|
||||
%endif
|
||||
mkdir -p cmake-bin
|
||||
ln -s /usr/bin/cmake3 cmake-bin/cmake
|
||||
%global cmake_path $PWD/cmake-bin
|
||||
|
||||
%if 0%{?rhel}
|
||||
sed -i.cmake -e 's/CFG_CMAKE cmake/&3/' configure
|
||||
%endif
|
||||
|
||||
%if %with llvm_static
|
||||
%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
|
||||
|
||||
%patch1 -p1 -b .stack-guard
|
||||
%patch2 -p1 -b .debuginfo
|
||||
|
||||
# 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 src/vendor -name .cargo-checksum.json \
|
||||
-exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
|
||||
|
||||
|
||||
%build
|
||||
|
||||
%ifarch aarch64
|
||||
%if %with bootstrap
|
||||
# Upstream binaries have a 4k-paged jemalloc, which breaks with Fedora 64k pages.
|
||||
# https://github.com/rust-lang/rust/issues/36994
|
||||
export MALLOC_CONF=lg_dirty_mult:-1
|
||||
%endif
|
||||
%endif
|
||||
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
||||
%{?library_path:export LIBRARY_PATH="%{library_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
|
||||
|
||||
%configure --disable-option-checking \
|
||||
--libdir=%{common_libdir} \
|
||||
--build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
|
||||
--enable-local-rust --local-rust-root=%{local_rust_root} \
|
||||
%{!?with_bundled_llvm:--llvm-root=%{_prefix} --disable-codegen-tests} \
|
||||
%{!?with_bundled_llvm: --llvm-root=%{llvm_root} --disable-codegen-tests \
|
||||
%{!?with_llvm_static: --enable-llvm-link-shared } } \
|
||||
--disable-jemalloc \
|
||||
--disable-rpath \
|
||||
--disable-debuginfo-lines \
|
||||
--disable-debuginfo-only-std \
|
||||
--enable-debuginfo \
|
||||
--enable-vendor \
|
||||
--release-channel=%{channel}
|
||||
|
||||
%make_build VERBOSE=1
|
||||
./x.py build
|
||||
./x.py doc
|
||||
|
||||
|
||||
%install
|
||||
%make_install VERBOSE=1
|
||||
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
||||
%{?library_path:export LIBRARY_PATH="%{library_path}"}
|
||||
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
|
||||
|
||||
DESTDIR=%{buildroot} ./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' \
|
||||
-exec ln -v -f -s -t . '{}' '+')
|
||||
|
||||
# Remove installer artifacts (manifests, uninstall scripts, etc.)
|
||||
find %{buildroot}/%{_libdir}/rustlib/ -maxdepth 1 -type f -exec rm -v '{}' '+'
|
||||
|
||||
# We don't want to ship the target shared libraries for lack of any Rust ABI.
|
||||
find %{buildroot}/%{_libdir}/rustlib/ -type f -name '*.so' -exec rm -v '{}' '+'
|
||||
|
||||
# The remaining shared libraries should be executable for debuginfo extraction.
|
||||
find %{buildroot}/%{_libdir}/ -type f -name '*.so' -exec chmod -v +x '{}' '+'
|
||||
|
||||
# They also don't need the .rustc metadata anymore, so they won't support linking.
|
||||
# (but this needs the rhbz1380961 fix, or else eu-strip will clobber .dynsym)
|
||||
%if 0%{?fedora} >= 25
|
||||
find %{buildroot}/%{_libdir}/ -type f -name '*.so' -exec objcopy -R .rustc '{}' ';'
|
||||
%endif
|
||||
find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -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-APACHE
|
||||
rm -f %{buildroot}/%{_docdir}/%{name}/LICENSE-MIT
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/README.md
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/COPYRIGHT
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-APACHE
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-MIT
|
||||
|
||||
# Sanitize the HTML documentation
|
||||
find %{buildroot}/%{_docdir}/%{name}/html -empty -delete
|
||||
find %{buildroot}/%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+'
|
||||
find %{buildroot}%{_docdir}/%{name}/html -empty -delete
|
||||
find %{buildroot}%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+'
|
||||
|
||||
# Move rust-gdb's python scripts so they're noarch
|
||||
mkdir -p %{buildroot}/%{_datadir}/%{name}
|
||||
mv -v %{buildroot}/%{_libdir}/rustlib/etc %{buildroot}/%{_datadir}/%{name}/
|
||||
%if %without lldb
|
||||
rm -f %{buildroot}%{_bindir}/rust-lldb
|
||||
rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
|
||||
%endif
|
||||
|
||||
|
||||
%check
|
||||
# Note, many of the tests execute in parallel threads,
|
||||
# so it's better not to use a parallel make here.
|
||||
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
||||
%{?library_path:export LIBRARY_PATH="%{library_path}"}
|
||||
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
|
||||
|
||||
# The results are not stable on koji, so mask errors and just log it.
|
||||
make check-lite VERBOSE=1 -k || python2 src/etc/check-summary.py tmp/*.log || :
|
||||
./x.py test --no-fail-fast || :
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
|
@ -287,30 +406,94 @@ make check-lite VERBOSE=1 -k || python2 src/etc/check-summary.py tmp/*.log || :
|
|||
%doc README.md
|
||||
%{_bindir}/rustc
|
||||
%{_bindir}/rustdoc
|
||||
%{_libdir}/*.so
|
||||
%{_mandir}/man1/rustc.1*
|
||||
%{_mandir}/man1/rustdoc.1*
|
||||
%{_libdir}/lib*
|
||||
%dir %{_libdir}/rustlib
|
||||
%{_libdir}/rustlib/%{rust_triple}
|
||||
%dir %{rustlibdir}
|
||||
%dir %{rustlibdir}/%{rust_triple}
|
||||
%dir %{rustlibdir}/%{rust_triple}/lib
|
||||
%{rustlibdir}/%{rust_triple}/lib/*.so
|
||||
|
||||
|
||||
%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
|
||||
%{_datadir}/%{name}
|
||||
%{rustlibdir}/etc/gdb_*.py*
|
||||
|
||||
|
||||
%if %with lldb
|
||||
%files lldb
|
||||
%{_bindir}/rust-lldb
|
||||
%{rustlibdir}/etc/lldb_*.py*
|
||||
%endif
|
||||
|
||||
|
||||
%files doc
|
||||
%docdir %{_docdir}/%{name}
|
||||
%dir %{_docdir}/%{name}
|
||||
%license %{_docdir}/%{name}/html/FiraSans-LICENSE.txt
|
||||
%license %{_docdir}/%{name}/html/Heuristica-LICENSE.txt
|
||||
%license %{_docdir}/%{name}/html/LICENSE-APACHE.txt
|
||||
%license %{_docdir}/%{name}/html/LICENSE-MIT.txt
|
||||
%license %{_docdir}/%{name}/html/SourceCodePro-LICENSE.txt
|
||||
%license %{_docdir}/%{name}/html/SourceSerifPro-LICENSE.txt
|
||||
%doc %{_docdir}/%{name}/html/
|
||||
%dir %{_docdir}/%{name}/html
|
||||
%{_docdir}/%{name}/html/*/
|
||||
%{_docdir}/%{name}/html/*.html
|
||||
%{_docdir}/%{name}/html/*.css
|
||||
%{_docdir}/%{name}/html/*.js
|
||||
%{_docdir}/%{name}/html/*.woff
|
||||
%license %{_docdir}/%{name}/html/*.txt
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 20 2017 Josh Stone <jistone@redhat.com> - 1.19.0-1
|
||||
- Update to 1.19.0.
|
||||
|
||||
* Thu Jun 08 2017 Josh Stone <jistone@redhat.com> - 1.18.0-1
|
||||
- Update to 1.18.0.
|
||||
|
||||
* Mon May 08 2017 Josh Stone <jistone@redhat.com> - 1.17.0-2
|
||||
- Move shared libraries back to libdir and symlink in rustlib
|
||||
|
||||
* Thu Apr 27 2017 Josh Stone <jistone@redhat.com> - 1.17.0-1
|
||||
- Update to 1.17.0.
|
||||
|
||||
* Thu Mar 16 2017 Josh Stone <jistone@redhat.com> - 1.16.0-1
|
||||
- Update to 1.16.0.
|
||||
- Use rustbuild instead of the old makefiles.
|
||||
- Update bootstrapping to include rust-std and cargo.
|
||||
- Add a rust-lldb subpackage.
|
||||
|
||||
* Fri Feb 10 2017 Josh Stone <jistone@redhat.com> - 1.15.1-2
|
||||
- Rebuild without bootstrap binaries.
|
||||
|
||||
* Fri Feb 10 2017 Josh Stone <jistone@redhat.com> - 1.15.1-1
|
||||
- Update to 1.15.1.
|
||||
- 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 <jistone@redhat.com> - 1.14.0-1
|
||||
- Update to 1.14.0.
|
||||
- Rewrite bootstrap logic to target specific arches.
|
||||
|
||||
* Thu Nov 10 2016 Josh Stone <jistone@redhat.com> - 1.13.0-1
|
||||
- Update to 1.13.0.
|
||||
- Use hardening flags for linking.
|
||||
- Split the standard library into its own package
|
||||
- Centralize rustlib/ under /usr/lib/ for multilib integration.
|
||||
|
||||
* Sat Oct 22 2016 Josh Stone <jistone@redhat.com> - 1.12.1-1.1
|
||||
- Rebuild without bootstrap binaries.
|
||||
|
||||
* Sat Oct 22 2016 Josh Stone <jistone@redhat.com> - 1.12.1-1
|
||||
- Update to 1.12.1.
|
||||
- Merge package changes from rawhide.
|
||||
|
|
|
|||
Loading…
Reference in New Issue