# TODO
# - consider a rust-std package containing .../rustlib/$target
# This might allow multilib cross-compilation to work naturally.
+# - package additional tools
#
# Conditional build:
%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_with tests # build without tests
# The channel can be stable, beta, or nightly
# 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.20.0
-%define bootstrap_cargo 0.21.0
-%define bootstrap_date 2017-08-31
+%define bootstrap_rust 1.29.2
+%define bootstrap_cargo 0.29.0
+%define bootstrap_date 2018-10-12
Summary: The Rust Programming Language
Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.21.0
-Release: 1
+Version: 1.30.0
+Release: 2
# 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: bc494706b764276613064aad52922f53
+# Source0-md5: a4aec25d5a3987f62c3fb8c00178f3a2
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.gz
-# Source1-md5: 5b63778b4877bcfd431b56c485f4876b
+# Source1-md5: 5b7d77ab62d750aab6e07cc74e5a54b8
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.gz
-# Source2-md5: 5e8c3a6a7b94e6a32f85230111a684a3
-Patch0: rust-1.21.0-44203-exclude-compiler-rt-test.patch
+# Source2-md5: e318e1844ef64195b6f4c4243b790e24
+Patch0: x32.patch
URL: https://www.rust-lang.org/
# for src/compiler-rt
BuildRequires: cmake >= 3.4.3
BuildRequires: curl
BuildRequires: libstdc++-devel
-BuildRequires: llvm-devel
+%{?with_system_llvm:BuildRequires: llvm-devel}
BuildRequires: ncurses-devel
BuildRequires: python >= 1:2.7
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# 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: %{x8664} %{ix86}
+ExclusiveArch: %{x8664} %{ix86} x32
+%ifarch x32
+%define rust_triple x86_64-unknown-linux-gnux32
+%else
%define rust_triple %{_target_cpu}-unknown-linux-gnu
+%endif
%if %{without bootstrap}
%define local_rust_root %{_prefix}
# 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 buld itself
+# 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.*'
+%define skip_post_check_so 'librustc.*llvm.*\.so.*'
# ALL Rust libraries are private, because they don't keep an ABI.
%define _noautoreqfiles lib.*-[[:xdigit:]]{8}[.]so.*
Ten pakiet zawiera dokumentację w formacie HTML do języka
programowania Rust i jego biblioteki standardowej.
+%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 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 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: bash-completion
+
+%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}
+%ifarch x32
%patch0 -p1
+%endif
%if %{with bootstrap}
%ifarch %{x8664}
%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}
# 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
--disable-option-checking \
--disable-rpath \
--disable-debuginfo-lines \
+%if %{with full_debuginfo}
--disable-debuginfo-only-std \
--enable-debuginfo \
+%else
+ --enable-debuginfo-only-std \
+ --disable-debuginfo \
+%endif
+ --enable-extended \
--enable-llvm-link-shared \
- --enable-local-rust --local-rust-root=%{local_rust_root} \
+ --local-rust-root=%{local_rust_root} \
--enable-vendor \
--llvm-root=%{_prefix} \
--release-channel=%{channel}
+RUST_BACKTRACE=full \
./x.py dist
%{?with_tests:./x.py test}
%install
rm -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT ./x.py dist --install
+DESTDIR=$RPM_BUILD_ROOT ./x.py install
+DESTDIR=$RPM_BUILD_ROOT ./x.py install src
# Make sure the shared libraries are in the proper libdir
%if "%{_libdir}" != "%{common_libdir}"
install -d $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 README.md src/libbacktrace/LICENSE-libbacktrace src/rt/hoedown/LICENSE-hoedown
+%doc COPYRIGHT LICENSE-APACHE LICENSE-MIT README.md src/libbacktrace/LICENSE-libbacktrace
%attr(755,root,root) %{_bindir}/rustc
%attr(755,root,root) %{_bindir}/rustdoc
%attr(755,root,root) %{_libdir}/libarena-*.so
-%attr(755,root,root) %{_libdir}/libflate-*.so
%attr(755,root,root) %{_libdir}/libfmt_macros-*.so
-%attr(755,root,root) %{_libdir}/libgetopts-*.so
%attr(755,root,root) %{_libdir}/libgraphviz-*.so
%attr(755,root,root) %{_libdir}/libproc_macro-*.so
-%attr(755,root,root) %{_libdir}/libproc_macro_plugin-*.so
%attr(755,root,root) %{_libdir}/librustc*-*.so
-%attr(755,root,root) %{_libdir}/librustdoc-*.so
%attr(755,root,root) %{_libdir}/libserialize-*.so
%attr(755,root,root) %{_libdir}/libstd-*.so
%attr(755,root,root) %{_libdir}/libsyntax-*.so
%{_mandir}/man1/rustdoc.1*
%dir %{rustlibdir}
%dir %{rustlibdir}/%{rust_triple}
+%dir %{rustlibdir}/%{rust_triple}/codegen-backends
+%attr(755,root,root) %{rustlibdir}/%{rust_triple}/codegen-backends/*.so
%dir %{rustlibdir}/%{rust_triple}/lib
%attr(755,root,root) %{rustlibdir}/%{rust_triple}/lib/*.so
%{rustlibdir}/%{rust_triple}/lib/*.rlib
%defattr(644,root,root,755)
%dir %{_docdir}/%{name}
%doc %{_docdir}/%{name}/html
+
+%files -n cargo
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cargo
+%{_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