Changes - SailfishOS Open Build Service

Changes of Revision 40

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Added	rust.spec
@@ -0,0 +1,277 @@ +# Combined rust / cross-{arch}-rust) specfile +Name: rust +# Keep Name on top ! + +%global rustc_version 1.33.0 +%global cargo_version 1.33.0 +%global rust_triple i686-unknown-linux-gnu + +Version: %{rustc_version} +Release: 1 +Summary: The Rust Programming Language +License: (ASL 2.0 or MIT) and (BSD and MIT) +URL: https://www.rust-lang.org +ExclusiveArch: %{ix86} + +%global rustc_package rustc-%{rustc_version}-src +Source0: https://static.rust-lang.org/dist/rustc-%{rustc_version}-src.tar.xz +Source1: https://static.rust-lang.org/dist/rust-%{rustc_version}-%{rust_triple}.tar.gz + +Patch1: add_ffi.patch +Patch2: llvm-targets.patch + +%global bootstrap_root rust-%{rustc_version}-%{rust_triple} +%global local_rust_root %{_builddir}/%{bootstrap_root}/usr +%global bootstrap_source rust-%{rustc_version}-%{rust_triple}.tar.gz + +BuildRequires: gcc-c++ +BuildRequires: ncurses-devel +BuildRequires: curl +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(zlib) +BuildRequires: python +BuildRequires: llvm-devel +BuildRequires: llvm-static +BuildRequires: libffi-devel + +Requires: %{name}-std-static = %{rustc_version}-%{release} +Requires: /usr/bin/cc + +# ALL Rust libraries are private, because they don't keep an ABI. +%global _privatelibs lib(.-[[:xdigit:]]{16}\|rustc.)[.]so. +%global __provides_exclude ^(%{_privatelibs})$ +%global __requires_exclude ^(%{_privatelibs})$ +%global __provides_exclude_from ^(%{_docdir}\|%{rustlibdir}/src)/.$ +%global __requires_exclude_from ^(%{_docdir}\|%{rustlibdir}/src)/.$ + +# While we don't want to encourage dynamic linking to Rust shared libraries, as +# there's no stable ABI, we still need the unallocated metadata (.rustc) to +# support custom-derive plugins like #[proc_macro_derive(Foo)]. But eu-strip is +# very eager by default, so we have to limit it to -g, only debugging symbols. +%global _find_debuginfo_opts -g +%undefine _include_minidebuginfo + +%global rustflags -Clink-arg=-Wl,-z,relro,-z,now + +%description +Rust is a systems programming language that runs blazingly fast, prevents +segfaults, and guarantees thread safety. + +This package includes the Rust compiler and documentation generator. + + +%package std-static +Summary: Standard library for Rust + +%description std-static +This package includes the standard libraries for building applications +written in Rust. + + +%package debugger-common +Summary: Common debugger pretty printers for Rust +BuildArch: noarch + +%description debugger-common +This package includes the common functionality for %{name}-gdb and %{name}-lldb. + + +%package gdb +Summary: GDB pretty printers for Rust +BuildArch: noarch +Requires: gdb +Requires: %{name}-debugger-common = %{rustc_version}-%{release} + +%description gdb +This package includes the rust-gdb script, which allows easier debugging of Rust +programs. + + +%package lldb +Summary: LLDB pretty printers for Rust + +Requires: lldb +Requires: python2-lldb +Requires: %{name}-debugger-common = %{rustc_version}-%{release} + +%description lldb +This package includes the rust-lldb script, which allows easier debugging of Rust +programs. + + +%package -n cargo +Summary: Rust's package manager and build tool +Version: %{cargo_version} +Requires: rust + +%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. + +%prep + +%setup -q -n %{bootstrap_root} -T -b 1 +./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \ + --prefix=%{local_rust_root} --disable-ldconfig +test -f '%{local_rust_root}/bin/cargo' +test -f '%{local_rust_root}/bin/rustc' + +%setup -q -n %{rustc_package} +%patch1 -p1 +%patch2 -p1 + +# rm -rf src/llvm/ +rm -rf src/llvm-emscripten/ + +# We never enable other LLVM tools. +rm -rf src/tools/clang +rm -rf src/tools/lld +rm -rf src/tools/lldb + +# extract bundled licenses for packaging +sed -e '/\//q' src/libbacktrace/backtrace.h \ + >src/libbacktrace/LICENSE-libbacktrace + +# 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 + +export RUSTFLAGS="%{rustflags}" + +# We're going to override --libdir when configuring to get rustlib into a +# common path, but we'll fix the shared libraries during install. +%global common_libdir %{_prefix}/lib +%global rustlibdir %{common_libdir}/rustlib + +# full debuginfo is exhausting memory; just do libstd for now +# https://github.com/rust-lang/rust/issues/45854 +%define enable_debuginfo --disable-debuginfo --disable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines + +%configure --disable-option-checking \ + --libdir=%{common_libdir} \ + --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \ + --local-rust-root=%{local_rust_root} \ + --enable-optimize \ + --disable-rpath \ + --disable-docs \ + --disable-compiler-docs \ + %{enable_debuginfo} \ + --enable-vendor \ + --enable-extended \ + --tools=cargo + +python ./x.py build + + +%install +export RUSTFLAGS="%{rustflags}" + +DESTDIR=%{buildroot} python ./x.py install + +# Make sure the shared libraries are in the proper libdir +%if "%{_libdir}" != "%{common_libdir}" +mkdir -p %{buildroot}%{_libdir} +find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '.so' \ + -exec mv -v -t %{buildroot}%{_libdir} '{}' '+' +%endif + +# The shared libraries should be executable for debuginfo extraction. +find %{buildroot}%{_libdir} -maxdepth 1 -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. +(cd "%{buildroot}%{rustlibdir}/%{rust_triple}/lib" && + find ../../../../%{_lib} -maxdepth 1 -name '.so' \| + while read lib; do + # make sure they're actually identical! + cmp "$lib" "${lib##/}" + ln -v -f -s -t . "$lib" + done) +
[-] [+]	Added	add_ffi.patch ^
@@ -0,0 +1,16 @@ +diff -ur ref/src/librustc_llvm/build.rs patched/src/librustc_llvm/build.rs +--- ref/src/librustc_llvm/build.rs 2018-12-05 00:41:40.000000000 +0100 ++++ patched/src/librustc_llvm/build.rs 2018-12-30 22:54:16.972938493 +0100 +@@ -183,7 +183,10 @@ + } + cmd.args(&components); + +- for lib in output(&mut cmd).split_whitespace() { ++ let mut libs = output(&mut cmd).split_whitespace().map(\|str\| str.to_string()).collect::<Vec<_>>(); ++ libs.push(String::from("-lffi")); ++ for lib in libs { ++ let lib: &str = lib.as_ref(); + let name = if lib.starts_with("-l") { + &lib[2..] + } else if lib.starts_with("-") { +
[-] [+]	Added	llvm-targets.patch ^
@@ -0,0 +1,20 @@ +diff -ur rustc-1.33.0-src/config.toml.example rustc-1.33.0-src-new/config.toml.example +--- rustc-1.33.0-src/config.toml.example 2019-02-28 09:53:34.000000000 +0100 ++++ rustc-1.33.0-src-new/config.toml.example 2019-03-31 21:19:48.750629718 +0200 +@@ -61,14 +61,14 @@ + # support. You'll need to write a target specification at least, and most + # likely, teach rustc about the C ABI of the target. Get in touch with the + # Rust team and file an issue if you need assistance in porting! +-#targets = "X86;ARM;AArch64;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX;Hexagon" ++#targets = "X86;ARM;AArch64" + + # LLVM experimental targets to build support for. These targets are specified in + # the same format as above, but since these targets are experimental, they are + # not built by default and the experimental Rust compilation targets that depend + # on them will not work unless the user opts in to building them. By default the + # `WebAssembly` and `RISCV` targets are enabled when compiling LLVM from scratch. +-#experimental-targets = "WebAssembly;RISCV" ++experimental-targets = "" + + # Cap the number of parallel linker invocations when compiling LLVM. + # This can be useful when building LLVM with debug info, which significantly
	Added	rust-1.33.0-i686-unknown-linux-gnu.tar.gz ^
	Added	rustc-1.33.0-src.tar.xz ^