X-Git-Url: http://git.pld-linux.org/?p=packages%2Frust.git;a=blobdiff_plain;f=rust.spec;h=ce7f94baf9f5a14869d770acbe3371665f2d6c69;hp=39d316340fa3b738a9413cb04dbbf8c3cc3f6135;hb=5aae056;hpb=23edbd59e48ea776cd7738be915eb13ca9c5caca

diff --git a/rust.spec b/rust.spec
index 39d3163..ce7f94b 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,9 +1,12 @@
 # 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
+%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
@@ -18,73 +21,124 @@
 # 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
-%define		bootstrap_cargo	0.18.0
-%define		bootstrap_date	2017-04-27
+%define		bootstrap_rust	1.46.0
+%define		bootstrap_cargo	1.46.0
+%define		bootstrap_date	2020-08-27
 
+%ifarch x32
+%define		with_cross	1
+%endif
 Summary:	The Rust Programming Language
+Summary(pl.UTF-8):	Język programowania Rust
 Name:		rust
-Version:	1.18.0
+Version:	1.47.0
 Release:	1
 # Licenses: (rust itself) and (bundled libraries)
-License:	(ASL 2.0 or MIT) and (BSD and ISC and MIT)
+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:	https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.gz
-# Source1-md5:	98e8f479515969123b4c203191104a54
-Source2:	https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.gz
-# Source2-md5:	2d5de850c32aa8d40c8c21abacf749f8
-Patch0:		rust-1.16.0-configure-no-override.patch
+Source0:	https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
+# Source0-md5:	6283a61cac54bb0a7d32bc447d07fadc
+Source1:	https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
+# Source1-md5:	45eaf35327db0bac923c65048637a2f5
+Source2:	https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
+# Source2-md5:	6a2422d81e98df5b71a959c70aa4c81b
+Source3:	https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
+# Source3-md5:	144376df8b0ddfef57900b867746a9ab
+Patch0:		%{name}-x32.patch
 URL:		https://www.rust-lang.org/
-BuildRequires:	cmake
+# for src/compiler-rt
+BuildRequires:	cmake >= 3.4.3
 BuildRequires:	curl
-BuildRequires:	gcc
-BuildRequires:	libstdc++-devel
+# make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
+BuildRequires:	procps
+BuildRequires:	python >= 1:2.7
+BuildRequires:	rpmbuild(macros) >= 1.752
+%if %{without cross}
+BuildRequires:	curl-devel
+BuildRequires:	libgit2-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	llvm-devel
-BuildRequires:	ncurses-devel
-BuildRequires:	python
+%{?with_system_llvm:BuildRequires:	llvm-devel >= 8.0}
+BuildRequires:	openssl-devel >= 1.0.1
 BuildRequires:	zlib-devel
+%endif
 %if %{without bootstrap}
 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
+%ifarch x32
+BuildRequires:	glibc-devel(x32)
+BuildRequires:	glibc-devel(x86_64)
+%if "%{_host_cpu}" == "x86_64"
+# building on x86_64 host with --target x32-pld-linux
+BuildRequires:	curl-devel
+BuildRequires:	gcc-multilib-x32
+BuildRequires:	libgit2-devel
+BuildRequires:	libstdc++-devel
+%{?with_system_llvm:BuildRequires:	llvm-devel >= 8.0}
+BuildRequires:	openssl-devel >= 1.0.1
+BuildRequires:	zlib-devel
+%else
+# building x86_64-hosted crosscompiler on x32 host
+BuildRequires:	gcc-multilib-64
+BuildRequires:	libstdc++-multilib-64-devel
+# how to specify?
+#BuildRequires:	curl-devel.x86_64
+#BuildRequires:	libgit2-devel.x86_64
+#BuildRequires:	llvm-devel.x86_64 >= 7.0
+#BuildRequires:	openssl-devel.x86_64
+#BuildRequires:	zlib-devel.x86_64
+%endif
+%endif
 # 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.
-# https://doc.rust-lang.org/stable/book/getting-started.html#tier-1
-ExclusiveArch:	%{x8664} %{ix86}
+# x32 is Tier 2, only rust-std is available (no rustc or cargo).
+# https://doc.rust-lang.org/nightly/rustc/platform-support.html
+ExclusiveArch:	%{x8664} %{ix86} x32 aarch64
+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_host_triple	x86_64-unknown-linux-gnu
+%define		rust_bootstrap_triple	x86_64-unknown-linux-gnu
+%else
+%define		rust_triple		%{_target_cpu}-unknown-linux-gnu
+%define		rust_host_triple	%{rust_triple}
+%define		rust_bootstrap_triple	%{rust_triple}
+%endif
 
 %if %{without bootstrap}
 %define		local_rust_root	%{_prefix}
 %else
-%define		bootstrap_root	rust-%{bootstrap_rust}-%{rust_triple}
+%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 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.*
 %define		_noautoprovfiles	lib.*-[[:xdigit:]]{8}[.]so.*
 
+%define		x_py { \
+	x_py() { \
+		local cmd="$1"; \
+		shift; \
+		%{?__jobs:CARGO_BUILD_JOBS=%__jobs }./x.py "$cmd" %{?__jobs:-j %__jobs} "$@"; \
+	}; x_py }
+
+
 %description
 Rust is a systems programming language that runs blazingly fast,
 prevents segfaults, and guarantees thread safety.
@@ -92,61 +146,128 @@ prevents segfaults, and guarantees thread safety.
 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
+%{?noarchpackage}
 
 %description debugger-common
-This package includes the common functionality for %{name}-gdb and
-%{name}-lldb.
+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
-BuildArch:	noarch
+%{?noarchpackage}
 
 %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
-Requires:	python-lldb
-BuildArch:	noarch
+%{?noarchpackage}
 
 %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
+Summary(pl.UTF-8):	Dokumentacja do Rusta
 Group:		Documentation
-BuildArch:	noarch
+%{?noarchpackage}
 
 %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}
-%patch0 -p1
+# irrelevant when not building rustc for x32
+#patch0 -p1
 
 %if %{with bootstrap}
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 tar xf %{SOURCE1}
 %endif
 %ifarch %{ix86}
 tar xf %{SOURCE2}
 %endif
+%ifarch aarch64
+tar xf %{SOURCE3}
+%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
@@ -154,46 +275,60 @@ test -f %{local_rust_root}/bin/rustc
 %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' library/backtrace/crates/backtrace-sys/src/libbacktrace/backtrace.h \
+	>library/backtrace/crates/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
+# 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 \
+	--build=%{rust_bootstrap_triple} \
+	--host=%{rust_host_triple} \
+	--target=%{rust_triple} \
 	--libdir=%{common_libdir} \
-	--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 \
-	--enable-llvm-link-shared \
+	--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
+export RUST_BACKTRACE=full
+%x_py dist --verbose
 
-%{?with_tests:./x.py test}
+%{?with_tests:%x_py test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-DESTDIR=$RPM_BUILD_ROOT ./x.py dist --install
+export DESTDIR=$RPM_BUILD_ROOT
+%x_py install
+%x_py install src
 
 # Make sure the shared libraries are in the proper libdir
 %if "%{_libdir}" != "%{common_libdir}"
@@ -219,10 +354,10 @@ find $RPM_BUILD_ROOT%{rustlibdir}/ -maxdepth 1 -type f -exec rm -v '{}' '+'
 # -- 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
@@ -230,7 +365,13 @@ find $RPM_BUILD_ROOT%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+'
 
 # Move rust-gdb's python scripts so they're noarch
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv -v $RPM_BUILD_ROOT%{rustlibdir}/%{_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
@@ -240,26 +381,41 @@ 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 library/backtrace/crates/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
+%attr(755,root,root) %{_bindir}/rls
+%attr(755,root,root) %{_bindir}/rust-analyzer
 %attr(755,root,root) %{_bindir}/rustc
 %attr(755,root,root) %{_bindir}/rustdoc
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_bindir}/rustfmt
+%attr(755,root,root) %{_libdir}/libchalk_derive-*.so
+%attr(755,root,root) %{_libdir}/librustc*-*.so
+%attr(755,root,root) %{_libdir}/libstd-*.so
+%attr(755,root,root) %{_libdir}/libtest-*.so
+%attr(755,root,root) %{_libdir}/libtracing_attributes-*.so
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
 %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
 
+# for cross-compiler (e.g. x86_64-hosted x32 rust)
+%if "%{rust_host_triple}" != "%{rust_triple}"
+%dir %{rustlibdir}/%{rust_host_triple}
+%{rustlibdir}/%{rust_host_triple}/analysis
+%dir %{rustlibdir}/%{rust_host_triple}/lib
+%attr(755,root,root) %{rustlibdir}/%{rust_host_triple}/lib/*.so
+%{rustlibdir}/%{rust_host_triple}/lib/*.rlib
+%endif
+
 %files debugger-common
 %defattr(644,root,root,755)
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/etc
-%{_datadir}/%{name}/etc/debugger_*.py*
+%{_datadir}/%{name}/etc/lldb_commands
+%{_datadir}/%{name}/etc/rust_types.py
 
 %files lldb
 %defattr(644,root,root,755)
@@ -269,9 +425,28 @@ rm -rf $RPM_BUILD_ROOT
 %files gdb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rust-gdb
+%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
+
+%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}/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