# TODO
# - consider a rust-std package containing .../rustlib/$target
# This might allow multilib cross-compilation to work naturally.
-
-# The channel can be stable, beta, or nightly
-%define channel stable
-
+# - package additional tools
#
# Conditional build:
-%bcond_with bootstrap
-%bcond_without tests # build without tests
+%bcond_with bootstrap # bootstrap using precompiled binaries
+%bcond_with full_debuginfo # full debuginfo vs only std debuginfo (full takes gigabytes of memory to build)
+%bcond_without system_llvm # system LLVM
+%bcond_without rustc # rustc building
+%bcond_without cargo # cargo building
+%bcond_with tests # build without tests
+
+# The channel can be stable, beta, or nightly
+%define channel stable
%if "%{channel}" == "stable"
-%define rustc_package rustc-%{version}-src
+%define rustc_package rustc-%{version}-src
%else
-%define rustc_package rustc-%{channel}-src
+%define rustc_package rustc-%{channel}-src
%endif
# 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
-%define bootstrap_rust 1.17.0
-%global bootstrap_cargo 0.18.0
-%define bootstrap_date 2017-04-27
-%define bootstrap_base https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}
+%define bootstrap_rust 1.41.1
+%define bootstrap_cargo 1.41.0
+%define bootstrap_date 2020-02-27
+%ifarch x32
+%undefine with_cargo
+%undefine with_rustc
+%endif
Summary: The Rust Programming Language
+Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.18.0
-Release: 0.1
-License: (ASL 2.0 or MIT) and (BSD and ISC and MIT)
-# ^ written as: (rust itself) and (bundled libraries)
+Version: 1.42.0
+Release: 3
+# Licenses: (rust itself) and (bundled libraries)
+License: (Apache v2.0 or MIT) and (BSD and ISC and MIT)
Group: Development/Languages
-Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.gz
-# Source0-md5: c37c0cd9d500f6a9d1f2f44401351f88
-Source1: %{bootstrap_base}-x86_64-unknown-linux-gnu.tar.gz
-# Source1-md5: 98e8f479515969123b4c203191104a54
-Source2: %{bootstrap_base}-i686-unknown-linux-gnu.tar.gz
-# Source2-md5: 2d5de850c32aa8d40c8c21abacf749f8
+Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
+# Source0-md5: 03a6111956f8d3bfdfc21aedce7f06bc
+Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
+# Source1-md5: 3336c39311a33005d51298c60b99f2c1
+Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
+# Source2-md5: be3f4d5143483c754a3c272eb213cd07
+Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-std-%{bootstrap_rust}-x86_64-unknown-linux-gnux32.tar.xz
+# Source3-md5: 38da0bf057e0801669f18f74555830bf
URL: https://www.rust-lang.org/
-BuildRequires: cmake
+# for src/compiler-rt
+BuildRequires: cmake >= 3.4.3
BuildRequires: curl
-BuildRequires: gcc
BuildRequires: libstdc++-devel
-BuildRequires: llvm-devel
-BuildRequires: python
+%{?with_system_llvm:BuildRequires: llvm-devel >= 7.0}
+BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: python >= 1:2.7
BuildRequires: zlib-devel
%if %{without bootstrap}
-BuildRequires: cargo >= %{bootstrap_cargo}
-BuildRequires: %{name} < %{version}-%{release}
BuildRequires: %{name} >= %{bootstrap_rust}
+BuildRequires: cargo >= %{bootstrap_cargo}
+BuildConflicts: %{name} > %{version}
%endif
# make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
BuildRequires: procps
-# 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
# 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
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# Only x86_64 and i686 are Tier 1 platforms at this time.
+# x32 is Tier 2, only rust-std is available (no rustc or cargo).
# https://doc.rust-lang.org/stable/book/getting-started.html#tier-1
-ExclusiveArch: %{x8664} %{ix86} %{arm}
+ExclusiveArch: %{x8664} %{ix86} x32
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define rust_triple %{_target_cpu}-unknown-linux-gnu
+%ifarch x32
+%define rust_triple x86_64-unknown-linux-gnux32
+%define rust_bootstrap_triple x86_64-unknown-linux-gnu
+%else
+%define rust_triple %{_target_cpu}-unknown-linux-gnu
+%define rust_bootstrap_triple %{_target_cpu}-unknown-linux-gnu
+%endif
%if %{without bootstrap}
-%define local_rust_root %{_prefix}
+%define local_rust_root %{_prefix}
%else
-%define bootstrap_root rust-%{bootstrap_rust}-%{rust_triple}
-%define local_rust_root %{_builddir}/%{rustc_package}/%{bootstrap_root}
+%define bootstrap_root rust-%{bootstrap_rust}-%{rust_bootstrap_triple}
+%define local_rust_root %{_builddir}/%{rustc_package}/%{bootstrap_root}
%endif
+# We're going to override --libdir when configuring to get rustlib into a
+# common path, but we'll fix the shared libraries during install.
+# Without this ugly hack, rust would not be able to build itself
+# for non-bootstrap build, lib64 is just too complicated for it.
+%define common_libdir %{_prefix}/lib
+%define rustlibdir %{common_libdir}/rustlib
+
+# once_call/once_callable non-function libstdc++ symbols
+%define skip_post_check_so 'librustc.*llvm.*\.so.*'
+
# ALL Rust libraries are private, because they don't keep an ABI.
-%global _privatelibs lib.*-[[:xdigit:]]{8}[.]so.*
-%global __provides_exclude ^(%{_privatelibs})$
-%global __requires_exclude ^(%{_privatelibs})$
+%define _noautoreqfiles lib.*-[[:xdigit:]]{8}[.]so.*
+%define _noautoprovfiles lib.*-[[:xdigit:]]{8}[.]so.*
%description
Rust is a systems programming language that runs blazingly fast,
This package includes the Rust compiler, standard library, and
documentation generator.
+%description -l pl.UTF-8
+Rust to systemowy język programowania działający bardzo szybko,
+zapobiegający naruszeniom ochrony pamięci i gwarantujący
+bezpieczną wielowątkowość.
+
+%package debugger-common
+Summary: Common debugger pretty printers for Rust
+Summary(pl.UTF-8): Narzędzia wypisujące struktury Rusa wspólne dla różnych debuggerów
+Group: Development/Debuggers
+BuildArch: noarch
+
+%description debugger-common
+This package includes the common functionality for rust-gdb and
+rust-lldb.
+
+%description debugger-common -l pl.UTF-8
+Ten pakiet zawiera wspólny kod dla pakietów rust-gdb i rust-lldb.
+
%package gdb
Summary: GDB pretty printers for Rust
+Summary(pl.UTF-8): Ładne wypisywanie struktur Rusta w GDB
+Group: Development/Debuggers
+Requires: %{name}-debugger-common = %{version}-%{release}
Requires: gdb
-%if "%{_rpmversion}" >= "5"
BuildArch: noarch
-%endif
%description gdb
This package includes the rust-gdb script, which allows easier
debugging of Rust programs.
+%description gdb -l pl.UTF-8
+Ten pakiet zawiera skrypt rust-gdb, pozwalający na łatwiejsze
+odpluskwianie programów w języku Rust.
+
+%package lldb
+Summary: LLDB pretty printers for Rust
+Summary(pl.UTF-8): Ładne wypisywanie struktur Rusta w LLDB
+Group: Development/Debuggers
+Requires: %{name}-debugger-common = %{version}-%{release}
+Requires: lldb
+BuildArch: noarch
+
+%description lldb
+This package includes the rust-lldb script, which allows easier
+debugging of Rust programs.
+
+%description lldb -l pl.UTF-8
+Ten pakiet zawiera skrypt rust-lldb, pozwalający na łatwiejsze
+odpluskwianie programów w języku Rust.
+
%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.
+Summary(pl.UTF-8): Dokumentacja do Rusta
+Group: Documentation
+BuildArch: noarch
%description doc
This package includes HTML documentation for the Rust programming
language and its standard library.
+%description doc -l pl.UTF-8
+Ten pakiet zawiera dokumentację w formacie HTML do języka
+programowania Rust i jego biblioteki standardowej.
+
+%package -n cargo
+Summary: Rust's package manager and build tool
+Summary(pl.UTF-8): Zarządca pakietów i narzędzie do budowania
+Group: Development/Tools
+Requires: %{name}
+
+%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.
+
+%description -n cargo -l pl.UTF-8
+Cargo to narzędzie pozwalające projektom w języku Rust deklarować ich
+zależności i zapewniające powtarzalność procesu budowania.
+
+%package -n bash-completion-cargo
+Summary: Bash completion for cargo command
+Summary(pl.UTF-8): Bashowe dopełnianie parametrów polecenia cargo
+Group: Applications/Shells
+Requires: %{name} = %{version}-%{release}
+Requires: bash-completion
+
+%description -n bash-completion-cargo
+Bash completion for cargo command.
+
+%description -n bash-completion-cargo -l pl.UTF-8
+Bashowe dopełnianie parametrów polecenia cargo.
+
+%package -n zsh-completion-cargo
+Summary: Zsh completion for cargo command
+Summary(pl.UTF-8): Dopełnianie parametrów polecenia cargo w powłoce Zsh
+Group: Applications/Shells
+Requires: %{name} = %{version}-%{release}
+Requires: zsh
+
+%description -n zsh-completion-cargo
+Zsh completion for cargo command.
+
+%description -n zsh-completion-cargo -l pl.UTF-8
+Dopełnianie parametrów polecenia cargo w powłoce Zsh.
+
%prep
%setup -q -n %{rustc_package}
+
%if %{with bootstrap}
%ifarch %{x8664}
tar xf %{SOURCE1}
%ifarch %{ix86}
tar xf %{SOURCE2}
%endif
+%ifarch x32
+tar xf %{SOURCE1}
+cd %{bootstrap_root}
+tar xf %{SOURCE3}
+%{__mv} rust-std-%{bootstrap_rust}-%{rust_triple} rust-std-%{rust_triple}
+cd ..
+%endif
%{__mv} %{bootstrap_root} %{bootstrap_root}-root
%{bootstrap_root}-root/install.sh \
- --components=cargo,rustc,rust-std-%{rust_triple} \
+ --components=cargo,rustc,rust-std-%{rust_bootstrap_triple} \
--prefix=%{local_rust_root} \
--disable-ldconfig
test -f %{local_rust_root}/bin/cargo
test -f %{local_rust_root}/bin/rustc
+%ifarch x32
+%{bootstrap_root}-root/rust-std-%{rust_triple}/install.sh \
+ --components=rust-std-%{rust_triple} \
+ --prefix=%{local_rust_root} \
+ --disable-ldconfig
+%endif
%endif
# unbundle
-rm -r src/jemalloc/
-rm -r src/llvm/
+# We're disabling jemalloc, but rust-src still wants it.
+#%{__rm} -r src/jemalloc
+%{?with_system_llvm:%{__rm} -r src/llvm-project}
# extract bundled licenses for packaging
-cp -p src/rt/hoedown/LICENSE src/rt/hoedown/LICENSE-hoedown
-sed -e '/*\//q' src/libbacktrace/backtrace.h \
- >src/libbacktrace/LICENSE-libbacktrace
+sed -e '/*\//q' vendor/backtrace-sys/src/libbacktrace/backtrace.h \
+ >vendor/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
# rust-gdb has hardcoded SYSROOT/lib -- let's make it noarch
sed -i -e 's#DIRECTORY=".*"#DIRECTORY="%{_datadir}/%{name}/etc"#' \
src/etc/rust-gdb
-# These tests assume that alloc_jemalloc is present
-sed -i -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 -e '/target=mips/,+1s/^/# unsupported /' \
- src/test/run-make/atomic-lock-free/Makefile
-
-%if %{without bootstrap}
-# The hardcoded stage0 "lib" is inappropriate when using Fedora's own rustc
-sed -i -e '/^HLIB_RELATIVE/s/lib$/$$(CFG_LIBDIR_RELATIVE)/' mk/main.mk
-%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":{ }/' '{}' '+'
%build
%configure \
- --disable-option-checking \
- --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
- --enable-local-rust --local-rust-root=%{local_rust_root} \
- --llvm-root=%{_prefix} --disable-codegen-tests \
+ --build=%{rust_triple} \
+ --host=%{rust_triple} \
+ --target=%{rust_triple} \
+ --libdir=%{common_libdir} \
+ --disable-codegen-tests \
+ --disable-debuginfo-lines \
+%if %{with full_debuginfo}
+ --disable-debuginfo-only-std \
+ --enable-debuginfo \
+%else
+ --enable-debuginfo-only-std \
+ --disable-debuginfo \
+%endif
--disable-jemalloc \
+ --disable-option-checking \
--disable-rpath \
- --enable-debuginfo \
+ --enable-extended \
+ --enable-llvm-link-shared \
--enable-vendor \
+ --local-rust-root=%{local_rust_root} \
+ --llvm-root=%{_prefix} \
--release-channel=%{channel}
-./x.py dist
+RUST_BACKTRACE=full \
+./x.py dist --verbose
+
+%{?with_tests:./x.py test}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- VERBOSE=1 \
- DESTDIR=$RPM_BUILD_ROOT
-# Remove installer artifacts (manifests, uninstall scripts, etc.)
-find $RPM_BUILD_ROOT%{_libdir}/rustlib/ -maxdepth 1 -type f -exec rm -v '{}' '+'
+DESTDIR=$RPM_BUILD_ROOT ./x.py install
+DESTDIR=$RPM_BUILD_ROOT ./x.py install src
-# We don't want to ship the target shared libraries for lack of any Rust ABI.
-find $RPM_BUILD_ROOT%{_libdir}/rustlib/ -type f -name '*.so' -exec rm -v '{}' '+'
+# Make sure the shared libraries are in the proper libdir
+%if "%{_libdir}" != "%{common_libdir}"
+mkdir -p %{buildroot}%{_libdir}
+find $RPM_BUILD_ROOT%{common_libdir} -maxdepth 1 -type f -name '*.so' \
+ -exec mv -v -t $RPM_BUILD_ROOT%{_libdir} '{}' '+'
+%endif
-# The remaining shared libraries should be executable for debuginfo extraction.
+# The shared libraries should be executable for debuginfo extraction.
find $RPM_BUILD_ROOT%{_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 direct section removal breaks dynamic symbols -- leave it for now...)
-#find $RPM_BUILD_ROOT/%{_libdir}/ -type f -name '*.so' -exec objcopy -R .rustc '{}' ';'
+# 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 "$RPM_BUILD_ROOT%{rustlibdir}/%{rust_triple}/lib" &&
+ find ../../../../%{_lib} -maxdepth 1 -name '*.so' \
+ -exec ln -v -f -s -t . '{}' '+')
+
+# Remove installer artifacts (manifests, uninstall scripts, etc.)
+find $RPM_BUILD_ROOT%{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 $RPM_BUILD_ROOT%{_docdir}/%{name}/README.md
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYRIGHT
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}/LICENSE-APACHE
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}/LICENSE-MIT
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/README.md
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYRIGHT
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/LICENSE-APACHE
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/LICENSE-MIT
# Sanitize the HTML documentation
find $RPM_BUILD_ROOT%{_docdir}/%{name}/html -empty -delete
# Move rust-gdb's python scripts so they're noarch
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv -v $RPM_BUILD_ROOT%{_libdir}/rustlib%{_sysconfdir} $RPM_BUILD_ROOT%{_datadir}/%{name}/
+%{__mv} $RPM_BUILD_ROOT%{rustlibdir}/etc $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+# We don't need stdlib source
+%{__rm} -r $RPM_BUILD_ROOT%{rustlibdir}/src
+
+# Create the path for crate-devel packages
+install -d $RPM_BUILD_ROOT%{_datadir}/cargo/registry
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYRIGHT LICENSE-APACHE LICENSE-MIT
-%doc src/libbacktrace/LICENSE-libbacktrace
-%doc src/rt/hoedown/LICENSE-hoedown
-%doc README.md
+%doc COPYRIGHT LICENSE-APACHE LICENSE-MIT README.md vendor/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
+%attr(755,root,root) %{_bindir}/miri
+%attr(755,root,root) %{_bindir}/rls
%attr(755,root,root) %{_bindir}/rustc
%attr(755,root,root) %{_bindir}/rustdoc
+%attr(755,root,root) %{_bindir}/rustfmt
+%attr(755,root,root) %{_libdir}/librustc*-*.so
+%attr(755,root,root) %{_libdir}/libstd-*.so
+%attr(755,root,root) %{_libdir}/libtest-*.so
%{_mandir}/man1/rustc.1*
%{_mandir}/man1/rustdoc.1*
-%{_libdir}/lib*
-%dir %{_libdir}/rustlib
-%{_libdir}/rustlib/%{rust_triple}
+%dir %{rustlibdir}
+%dir %{rustlibdir}/%{rust_triple}
+%{rustlibdir}/%{rust_triple}/analysis
+%dir %{rustlibdir}/%{rust_triple}/lib
+%attr(755,root,root) %{rustlibdir}/%{rust_triple}/lib/*.so
+%{rustlibdir}/%{rust_triple}/lib/*.rlib
+
+%files debugger-common
+%defattr(644,root,root,755)
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/etc
+%{_datadir}/%{name}/etc/debugger_*.py*
+
+%files lldb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rust-lldb
+%{_datadir}/%{name}/etc/lldb_*.py*
%files gdb
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/rust-gdb
-%{_datadir}/%{name}
+%attr(755,root,root) %{_bindir}/rust-gdbgui
+%{_datadir}/%{name}/etc/gdb_*.py*
%files doc
%defattr(644,root,root,755)
%dir %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/html/FiraSans-LICENSE.txt
-%doc %{_docdir}/%{name}/html/Heuristica-LICENSE.txt
-%doc %{_docdir}/%{name}/html/LICENSE-APACHE.txt
-%doc %{_docdir}/%{name}/html/LICENSE-MIT.txt
-%doc %{_docdir}/%{name}/html/SourceCodePro-LICENSE.txt
-%doc %{_docdir}/%{name}/html/SourceSerifPro-LICENSE.txt
-%doc %{_docdir}/%{name}/html/
+%doc %{_docdir}/%{name}/html
+
+%files -n cargo
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cargo
+%attr(755,root,root) %{_bindir}/cargo-clippy
+%attr(755,root,root) %{_bindir}/cargo-fmt
+%attr(755,root,root) %{_bindir}/cargo-miri
+%attr(755,root,root) %{_bindir}/clippy-driver
+%{_mandir}/man1/cargo*.1*
+%dir %{_datadir}/cargo
+%dir %{_datadir}/cargo/registry
+
+%files -n bash-completion-cargo
+%defattr(644,root,root,755)
+%{_sysconfdir}/bash_completion.d/cargo
+
+%files -n zsh-completion-cargo
+%defattr(644,root,root,755)
+%{zsh_compdir}/_cargo
projects / packages / rust.git / blobdiff