Accepting request 568813 from devel:languages:rust

OBS-URL: https://build.opensuse.org/request/show/568813
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rust?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2018-01-26 12:35:07 +00:00 committed by Git OBS Bridge
commit d0b8686d5e
18 changed files with 74 additions and 65 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:502a87264148e359218136c0c98a6f60107d15254d99a015ffbf876929e56031
size 4257613

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14b5e6a4625e3a9fcf7805a4bab1f67b4816b56419f7cfaee94d84b2c82def72
size 5244349

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:883879cd5bb441d080bd2aa53b7d7edb19402509909d36c8421bc6ebc20884ea
size 5026354

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ebe231e5da2a06370f17050285ee694cf09ac2010d87dab334ae7eb7fb2d975
size 5312890

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba4cc5ca31c5016dbb06313065607050afb690945307752307b778abda92e78f
size 5006995

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3adb3ff6d250962211dda4b2336111a2b690963dad69172ec4d38ab6a82241c2
size 4982625

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eda613e1efeb97187b7cd0ebdcf98eb44a0c31eafdd4f4898a7740e02ca72893
size 4405145

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:450bd9a2f457422e42d898ef8d970919c6b7d1bbedb4e92606a8cfeedc6ed5bd
size 5365725

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4abbfa2f976d50b814dd5bcafe65bc8a31c551438f106e6d3612aaf78206adb
size 4655265

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2cd233ecd13759c5cc19329a2fac6b58305b9d675a86a920b3a46d4696cd975
size 5675017

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78cfc9eb3d8614955bc0d22df3ed971aa259033dfc209cdb9eebf40ea3c2d562
size 5460884

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a3e2d7d53623e239616a49ef80cb17d3e742f75b8c0237d96256b3459caa9cde
size 5841854

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d036bdd22ed64d833e08577c0d8630801be35a05016651eaa16050bc8446ab8
size 5407640

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:765da164984cff57c711c17fda5ceb76a06a05007ce99f3fc09db1ccf8b32cb1
size 5346283

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:af6ed71016b888060499687cd7b3893282b94820b45423354021e4de28eb785a
size 4832371

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff8a454104aba20426ea898ed7515ec5da7de07d11733cdda17462455beb76e8
size 5839521

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Tue Jan 23 09:18:27 UTC 2018 - tchvatal@suse.com
- Format with spec-cleaner
- Use python3 to run the install/build script as python2 is being
phased out
- State exclusivearch for all of ix86 and then specify we build as
i686 which is bit more obvious
-------------------------------------------------------------------
Mon Jan 22 11:21:42 UTC 2018 - mmanu84@outlook.de
- Update Cargo to v0.24.0
-------------------------------------------------------------------
Mon Jan 22 07:01:51 UTC 2018 - jones_ld@protonmail.com
- Add "Requires: %{name} to derived packages to fix derived
packages not being updated with rust (boo#1075883)
-------------------------------------------------------------------
Thu Jan 4 21:20:36 UTC 2018 - jones_ld@protonmail.com

View File

@ -18,9 +18,7 @@
%global prev_rust 1.22.1
%global cargo_version 0.23.0
%bcond_with rust_bootstrap
%global cargo_version 0.24.0
%global rust_arch %{_arch}
%global abi gnu
%ifarch armv7hl
@ -38,20 +36,19 @@
%global rust_arch powerpc64le
%endif
# Must restrict the x86 build to i686 since i586 is currently unsupported
%ifarch %ix86
%ifarch %{ix86}
%global rust_arch i686
%endif
%global rust_triple %{rust_arch}-unknown-linux-%{abi}
%global dl_url https://static.rust-lang.org/dist
%global common_libdir %{_prefix}/lib
%global rustlibdir %{common_libdir}/rustlib
%bcond_with rust_bootstrap
Name: rust
Version: 1.23.0
Release: 0
Summary: A systems programming language
License: MIT or Apache-2.0
License: MIT OR Apache-2.0
Group: Development/Languages/Other
Url: http://www.rust-lang.org
Source0: %{dl_url}/rustc-%{version}-src.tar.gz
@ -69,31 +66,23 @@ Source107: cargo-%{cargo_version}-s390x-unknown-linux-gnu.tar.gz
BuildRequires: ccache
BuildRequires: cmake >= 3.4.3
BuildRequires: curl
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: llvm-devel
BuildRequires: ninja
BuildRequires: procps
BuildRequires: python
Recommends: cargo
BuildRequires: python3-base
Recommends: %{name}-doc
Recommends: %{name}-std
Conflicts: otherproviders(rust)
Recommends: cargo
Conflicts: rustc-bootstrap
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Conflicts: rust
# Restrict the architectures as building rust relies on being initially
# bootstrapped before we can build the n+1 release
ExclusiveArch: x86_64 %{arm} aarch64 ppc64 ppc64le s390x
%ifarch %ix86
ExclusiveArch: i586 i686
ExclusiveArch: x86_64 %{arm} aarch64 ppc64 ppc64le s390x %{ix86}
%ifarch %{ix86}
BuildArch: i686
%endif
%if 0%{?suse_version}
BuildRequires: fdupes
%endif
%if %{with rust_bootstrap}
BuildRequires: rust-std-bootstrap = %{prev_rust}
BuildRequires: rustc-bootstrap = %{prev_rust}
@ -122,7 +111,8 @@ control like a low-level language would.
%package -n rust-std
Summary: Standard library for Rust
Group: Development/Languages/Other
Conflicts: otherproviders(rust-std)
Requires: %{name} = %{version}
Conflicts: rust-std
%description -n rust-std
This package includes the standard libraries for building
@ -131,7 +121,8 @@ applications written in Rust.
%package -n rust-doc
Summary: Rust documentation
Group: Development/Languages/Other
Conflicts: otherproviders(rust-doc)
Requires: %{name} = %{version}
Conflicts: rust-doc
%description -n rust-doc
Documentation for the Rust language.
@ -139,9 +130,10 @@ Documentation for the Rust language.
%package -n rust-gdb
Summary: Gdb integration for rust binaries
Group: Development/Languages/Other
Requires: %{name} = %{version}
Supplements: packageand(%{name}:gdb)
Conflicts: rust-gdb
Provides: rustc:%{_bindir}/rust-gdb
Conflicts: otherproviders(rust-gdb)
%description -n rust-gdb
This subpackage provides pretty printers and a wrapper script for
@ -150,6 +142,7 @@ invoking gdb on rust binaries.
%package -n rust-src
Summary: Sources for the Rust standard library
Group: Development/Languages/Other
Requires: %{name} = %{version}
BuildArch: noarch
%description -n rust-src
@ -161,7 +154,7 @@ as RLS or racer.
%ifarch x86_64
%setup -q -T -b 100 -n cargo-%{cargo_version}-%{rust_triple}
%endif
%ifarch %ix86
%ifarch %{ix86}
%setup -q -T -b 101 -n cargo-%{cargo_version}-i686-unknown-linux-%{abi}
%endif
%ifarch aarch64
@ -196,14 +189,17 @@ sed -e 's:<cargo-bin>:%{cargo_bin}:g' \
-e 's:<docdir>:%{_docdir}/%{name}:g' \
%{SOURCE1} > config.toml
# use python3
sed -i -e "1s|#!.*|#!/usr/bin/python3|" x.py
%build
export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
RUST_BACKTRACE=1 ./x.py build --config config.toml
./x.py doc --config config.toml
RUST_BACKTRACE=1 python3 ./x.py build --config config.toml
python3 ./x.py doc --config config.toml
%install
DESTDIR=%{buildroot} ./x.py install
DESTDIR=%{buildroot} ./x.py install src
DESTDIR=%{buildroot} python3 ./x.py install
DESTDIR=%{buildroot} python3 ./x.py install src
# Remove executable permission from HTML documentation
# to prevent RPMLINT errors.
@ -236,15 +232,12 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h > src/libbacktrace/LICENSE-libbackt
# Remove the license files from _docdir: make install put duplicates there
rm %{buildroot}%{_docdir}/%{name}/{README.md,COPYRIGHT,LICENSE-APACHE,LICENSE-MIT}
%if 0%{?suse_version}
%fdupes %{buildroot}%{_prefix}
%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%if 0%{?suse_version} == 1315
%doc COPYRIGHT LICENSE-APACHE LICENSE-MIT
%doc src/libbacktrace/LICENSE-libbacktrace
@ -265,7 +258,6 @@ rm %{buildroot}%{_docdir}/%{name}/{README.md,COPYRIGHT,LICENSE-APACHE,LICENSE-MI
%exclude %{rustlibdir}/src
%files -n rust-std
%defattr(-,root,root)
%dir %{rustlibdir}
%dir %{rustlibdir}/%{rust_triple}
%dir %{rustlibdir}/%{rust_triple}/lib
@ -273,23 +265,20 @@ rm %{buildroot}%{_docdir}/%{name}/{README.md,COPYRIGHT,LICENSE-APACHE,LICENSE-MI
%{rustlibdir}/%{rust_triple}/lib/*.so
%files -n rust-gdb
%defattr(-,root,root,-)
%{_bindir}/rust-gdb
%dir %{rustlibdir}
%dir %{rustlibdir}/etc
%{rustlibdir}/etc/debugger_pretty_printers_common.py
%{rustlibdir}/etc/gdb_load_rust_pretty_printers.py
%{rustlibdir}/etc/gdb_rust_pretty_printing.py
%{rustlibdir}/etc/lldb_rust_formatters.py
%dir %{rustlibdir}%{_sysconfdir}
%{rustlibdir}%{_sysconfdir}/debugger_pretty_printers_common.py
%{rustlibdir}%{_sysconfdir}/gdb_load_rust_pretty_printers.py
%{rustlibdir}%{_sysconfdir}/gdb_rust_pretty_printing.py
%{rustlibdir}%{_sysconfdir}/lldb_rust_formatters.py
%files -n rust-doc
%defattr(-,root,root)
%dir %{_docdir}/%{name}
%dir %{_docdir}/%{name}/html
%doc %{_docdir}/%{name}/html/*
%files -n rust-src
%defattr(-,root,root)
%dir %{rustlibdir}
%{rustlibdir}/src