add support for building multiple targets

[packages/rust.git] / rust.spec

diff --git a/rust.spec b/rust.spec
index 837912f031359206384ee47d7dc9107323b563c6..1d495f1fe377cfa46fe04127d73f4b909ccdebbf 100644 (file)
--- a/rust.spec
+++ b/rust.spec
@@ -1,5 +1,4 @@
 # TODO
-# - unpackaged %{rustlibdir}/%{rust_triple}/bin/rust-llvm-dwp
 # - consider a rust-std package containing .../rustlib/$target
 #   This might allow multilib cross-compilation to work naturally.
 # - package additional tools
@@ -60,7 +59,8 @@ BuildRequires:        cmake >= 3.4.3
 BuildRequires: curl
 # make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
 BuildRequires: procps
-BuildRequires: python >= 1:2.7
+BuildRequires: python3
+BuildRequires: python3-modules
 BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
 %if %{without cross}
@@ -151,6 +151,8 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %endif
 %endif
 
+%define                rust_targets            %rust_triple %{?rust_suppl_targets}
+
 %if %{without bootstrap}
 %define                local_rust_root %{_prefix}
 %else
@@ -176,7 +178,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
        x_py() { \
                local cmd="$1"; \
                shift; \
-               %{?__jobs:CARGO_BUILD_JOBS=%__jobs }./x.py "$cmd" %{?__jobs:-j %__jobs} "$@"; \
+               %{?__jobs:CARGO_BUILD_JOBS=%__jobs }%{__python3} ./x.py "$cmd" %{?__jobs:-j %__jobs} "$@"; \
        }; x_py }
 
 
@@ -384,10 +386,13 @@ find vendor -name .cargo-checksum.json \
        -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
 
 %build
+export CC="%{__cc}"
+export CXX="%{__cxx}"
+export AR="%{__ar}"
 %configure \
        --build=%{rust_bootstrap_triple} \
        --host=%{rust_host_triple} \
-       --target=%{rust_triple} \
+       --target="%(echo %rust_targets | tr ' ' ,)" \
        --libdir=%{common_libdir} \
        --disable-codegen-tests \
        --disable-debuginfo-lines \
@@ -432,12 +437,14 @@ find $RPM_BUILD_ROOT%{_libdir}/ -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.
-for l in libstd libtest ; do
-       liblib=$RPM_BUILD_ROOT%{_libdir}/${l}-*.so
-       libstd=$RPM_BUILD_ROOT%{rustlibdir}/%{rust_triple}/lib/${l}-*.so
-       if [ "$(basename ${liblib})" = "$(basename ${libstd})" ]; then
-               ln -vfsr ${libstd} $RPM_BUILD_ROOT%{_libdir}/
-       fi
+for rust_target in %rust_targets; do
+       for l in libstd libtest ; do
+               liblib=$RPM_BUILD_ROOT%{_libdir}/${l}-*.so
+               libstd=$RPM_BUILD_ROOT%{rustlibdir}/${rust_target}/lib/${l}-*.so
+               if [ "$(basename ${liblib})" = "$(basename ${libstd})" ]; then
+                       ln -vfsr ${libstd} $RPM_BUILD_ROOT%{_libdir}/
+               fi
+       done
 done
 
 # Remove installer artifacts (manifests, uninstall scripts, etc.)
@@ -475,6 +482,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc COPYRIGHT LICENSE-APACHE LICENSE-MIT README.md
+%attr(755,root,root) %{_bindir}/rust-demangler
 %attr(755,root,root) %{_bindir}/rustc
 %attr(755,root,root) %{_bindir}/rustdoc
 %attr(755,root,root) %{_bindir}/rustfmt
@@ -487,14 +495,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files analysis
 %defattr(644,root,root,755)
-%{rustlibdir}/%{rust_triple}/analysis
+%(for rust_target in %rust_targets; do
+echo "%{rustlibdir}/$rust_target/analysis"
+done
+)
 
 %files std
 %defattr(644,root,root,755)
-%dir %{rustlibdir}/%{rust_triple}
-%dir %{rustlibdir}/%{rust_triple}/lib
-%attr(755,root,root) %{rustlibdir}/%{rust_triple}/lib/*.so
-%{rustlibdir}/%{rust_triple}/lib/*.rlib
+%(for rust_target in %rust_targets; do
+cat <<EOF
+%dir %{rustlibdir}/$rust_target
+%dir %{rustlibdir}/$rust_target/lib
+%attr(755,root,root) %{rustlibdir}/$rust_target/lib/*.so
+%{rustlibdir}/$rust_target/lib/*.rlib
+EOF
+done
+)
+%dir %{rustlibdir}/%{rust_triple}/bin
+%attr(755,root,root) %{rustlibdir}/%{rust_triple}/bin/rust-llvm-dwp
 
 %files debugger-common
 %defattr(644,root,root,755)