From d5be6038974c9ecebd99fb8fab851ac7618a78ff2e7bbc10b9fd4f8a0d8d21ee Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Wed, 1 Feb 2017 09:35:55 +0000 Subject: [PATCH 01/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=33 --- rust.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/rust.spec b/rust.spec index 66a5a9c..6ba2790 100644 --- a/rust.spec +++ b/rust.spec @@ -42,28 +42,23 @@ Provides: rustc-stable = %{version} Conflicts: rustc-bootstrap BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le %if 0%{?suse_version} BuildRequires: fdupes %endif -%ifarch %{arm} +%ifnarch %{ix86} x86_64 BuildRequires: rustc-bootstrap <= %{prev_version} BuildRequires: rustc-bootstrap >= %{prev_version} %else - %ifarch aarch64 + %if %{with bootstrap} BuildRequires: rustc-bootstrap <= %{prev_version} BuildRequires: rustc-bootstrap >= %{prev_version} %else - %if %{with bootstrap} -BuildRequires: rustc-bootstrap <= %{prev_version} -BuildRequires: rustc-bootstrap >= %{prev_version} - %else - %if %{without bootstrap} + %if %{without bootstrap} BuildRequires: rust <= %{version} BuildRequires: rust >= %{prev_version} - %endif %endif - %endif + %endif %endif %description From 778c7e38e0debd33dbc4857b9b5520d06effb47387a30d615ed3481e744fa75f Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Wed, 1 Feb 2017 09:42:03 +0000 Subject: [PATCH 02/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=34 --- rust.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index 6ba2790..9240415 100644 --- a/rust.spec +++ b/rust.spec @@ -47,11 +47,11 @@ ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le BuildRequires: fdupes %endif %ifnarch %{ix86} x86_64 -BuildRequires: rustc-bootstrap <= %{prev_version} +BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap >= %{prev_version} %else %if %{with bootstrap} -BuildRequires: rustc-bootstrap <= %{prev_version} +BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap >= %{prev_version} %else %if %{without bootstrap} From f189933e4d9ac924a1cb2e54693215cc1d56f184c11db43c3c658094612d9590 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 6 Feb 2017 08:25:50 +0000 Subject: [PATCH 03/30] - Update to 1.15.0 - Language updates * Basic procedural macros allowing custom `#[derive]`, aka "macros 1.1", are stable. This allows popular code-generating crates like Serde and Diesel to work ergonomically. [RFC 1681]. * [Tuple structs may be empty. Unary and empty tuple structs may be instantiated with curly braces][36868]. Part of [RFC 1506]. * [A number of minor changes to name resolution have been activated][37127]. They add up to more consistent semantics, allowing for future evolution of Rust macros. Specified in [RFC 1560], see its section on ["changes"] for details of what is different. The breaking changes here have been transitioned through the [`legacy_imports`] lint since 1.14, with no known regressions. * [In `macro_rules`, `path` fragments can now be parsed as type parameter bounds][38279] * [`?Sized` can be used in `where` clauses][37791] * [There is now a limit on the size of monomorphized types and it can be modified with the `#![type_size_limit]` crate attribute, similarly to the `#![recursion_limit]` attribute][37789] - Compiler changes * [On Windows, the compiler will apply dllimport attributes when linking to extern functions][37973]. Additional attributes and flags can control which library kind is linked and its name. [RFC 1717]. * [Rust-ABI symbols are no longer exported from cdylibs][38117] * [The `--test` flag works with procedural macro crates][38107] * [Fix `extern "aapcs" fn` ABI][37814] * [The `-C no-stack-check` flag is deprecated][37636]. It does nothing. * [The `format!` expander recognizes incorrect `printf` and shell-style formatting directives and suggests the correct format][37613]. * [Only report one error for all unused imports in an import list][37456] - Compiler performance OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=35 --- config.toml | 203 ++++++++++++++++++++++++++++++++++++++++ rust.changes | 48 ++++++++++ rust.spec | 133 ++++++++++++++++++++------ rustc-1.14.0-src.tar.gz | 3 - rustc-1.15.0-src.tar.gz | 3 + 5 files changed, 357 insertions(+), 33 deletions(-) create mode 100644 config.toml delete mode 100644 rustc-1.14.0-src.tar.gz create mode 100644 rustc-1.15.0-src.tar.gz diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..5e6b889 --- /dev/null +++ b/config.toml @@ -0,0 +1,203 @@ +# Sample TOML configuration file for building Rust. +# +# To configure rustbuild, copy this file to the directory from which you will be +# running the build, and name it config.toml. +# +# All options are commented out by default in this file, and they're commented +# out with their default values. The build system by default looks for +# `config.toml` in the current directory of a build for build configuration, but +# a custom configuration file can also be specified with `--config` to the build +# system. + +# ============================================================================= +# Tweaking how LLVM is compiled +# ============================================================================= +[llvm] + +# Indicates whether the LLVM build is a Release or Debug build +optimize = true + +# Indicates whether an LLVM Release build should include debug info +release-debuginfo = false + +# Indicates whether the LLVM assertions are enabled or not +#assertions = false + +# Indicates whether ccache is used when building LLVM +#ccache = false +# or alternatively ... +#ccache = "/path/to/ccache" + +# If an external LLVM root is specified, we automatically check the version by +# default to make sure it's within the range that we're expecting, but setting +# this flag will indicate that this version check should not be done. +#version-check = false + +# Link libstdc++ statically into the librustc_llvm instead of relying on a +# dynamic version to be available. +static-libstdcpp = false + +# Tell the LLVM build system to use Ninja instead of the platform default for +# the generated build system. This can sometimes be faster than make, for +# example. +#ninja = false + +# ============================================================================= +# General build configuration options +# ============================================================================= +[build] + +# Build triple for the original snapshot compiler. This must be a compiler that +# nightlies are already produced for. The current platform must be able to run +# binaries of this build triple and the nightly will be used to bootstrap the +# first compiler. +#build = "x86_64-unknown-linux-gnu" # defaults to your host platform + +# In addition to the build triple, other triples to produce full compiler +# toolchains for. Each of these triples will be bootstrapped from the build +# triple and then will continue to bootstrap themselves. This platform must +# currently be able to run all of the triples provided here. +#host = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple + +# In addition to all host triples, other triples to produce the standard library +# for. Each host triple will be used to produce a copy of the standard library +# for each target triple. +#target = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple + +# Instead of downloading the src/nightlies.txt version of Cargo specified, use +# this Cargo binary instead to build all Rust code +cargo = "/usr/bin/cargo" + +# Instead of downloading the src/nightlies.txt version of the compiler +# specified, use this rustc binary instead as the stage0 snapshot compiler. +rustc = "/usr/bin/rustc" + +# Flag to specify whether any documentation is built. If false, rustdoc and +# friends will still be compiled but they will not be used to generate any +# documentation. +docs = true + +# Indicate whether the compiler should be documented in addition to the standard +# library and facade crates. +#compiler-docs = false + +# Indicate whether submodules are managed and updated automatically. +submodules = false + +# The path to (or name of) the GDB executable to use. This is only used for +# executing the debuginfo test suite. +#gdb = "gdb" + +# The node.js executable to use. Note that this is only used for the emscripten +# target when running tests, otherwise this can be omitted. +#nodejs = "node" + +# Python interpreter to use for various tasks throughout the build, notably +# rustdoc tests, the lldb python interpreter, and some dist bits and pieces. +# Note that Python 2 is currently required. +#python = "python2.7" + +# Indicate whether the vendored sources are used for Rust dependencies or not +vendor = true + +# ============================================================================= +# Options for compiling Rust code itself +# ============================================================================= +[rust] + +# Whether or not to optimize the compiler and standard library +optimize = true + +# Number of codegen units to use for each compiler invocation. A value of 0 +# means "the number of cores on this machine", and 1+ is passed through to the +# compiler. +codegen-units = 0 + +# Whether or not debug assertions are enabled for the compiler and standard +# library +#debug-assertions = false + +# Whether or not debuginfo is emitted +debuginfo = true + +# Whether or not line number debug information is emitted +debuginfo-lines = false + +# Whether or not to only build debuginfo for the standard library if enabled. +# If enabled, this will not compile the compiler with debuginfo, just the +# standard library. +debuginfo-only-std = false + +# Whether or not jemalloc is built and enabled +#use-jemalloc = true + +# Whether or not jemalloc is built with its debug option set +#debug-jemalloc = false + +# Whether or not `panic!`s generate backtraces (RUST_BACKTRACE) +#backtrace = true + +# The default linker that will be used by the generated compiler. Note that this +# is not the linker used to link said compiler. +#default-linker = "cc" + +# The default ar utility that will be used by the generated compiler if LLVM +# cannot be used. Note that this is not used to assemble said compiler. +#default-ar = "ar" + +# The "channel" for the Rust build to produce. The stable/beta channels only +# allow using stable features, whereas the nightly and dev channels allow using +# nightly features +channel = "stable" + +# By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix +# platforms to ensure that the compiler is usable by default from the build +# directory (as it links to a number of dynamic libraries). This may not be +# desired in distributions, for example. +#rpath = true + +# Flag indicating whether tests are compiled with optimizations (the -O flag) or +# with debuginfo (the -g flag) +#optimize-tests = true +#debuginfo-tests = true + +# Flag indicating whether codegen tests will be run or not. If you get an error +# saying that the FileCheck executable is missing, you may want to disable this. +#codegen-tests = true + +# ============================================================================= +# Options for specific targets +# +# Each of the following options is scoped to the specific target triple in +# question and is used for determining how to compile each target. +# ============================================================================= +[target.x86_64-unknown-linux-gnu] + +# C compiler to be used to compiler C code and link Rust code. Note that the +# default value is platform specific, and if not specified it may also depend on +# what platform is crossing to what platform. +#cc = "cc" + +# C++ compiler to be used to compiler C++ code (e.g. LLVM and our LLVM shims). +# This is only used for host targets. +#cxx = "c++" + +# Path to the `llvm-config` binary of the installation of a custom LLVM to link +# against. Note that if this is specifed we don't compile LLVM at all for this +# target. +#llvm-config = "../path/to/llvm/root/bin/llvm-config" + +# Path to the custom jemalloc static library to link into the standard library +# by default. This is only used if jemalloc is still enabled above +#jemalloc = "/path/to/jemalloc/libjemalloc_pic.a" + +# If this target is for Android, this option will be required to specify where +# the NDK for the target lives. This is used to find the C compiler to link and +# build native code. +#android-ndk = "/path/to/ndk" + +# The root location of the MUSL installation directory. The library directory +# will also need to contain libunwind.a for an unwinding implementation. Note +# that this option only makes sense for MUSL targets that produce statically +# linked binaries +#musl-root = "..." diff --git a/rust.changes b/rust.changes index 4294812..38e527d 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Mon Feb 6 08:25:17 UTC 2017 - luke.nukem.jones@gmail.com + +- Update to 1.15.0 + +- Language updates + * Basic procedural macros allowing custom `#[derive]`, aka "macros 1.1", are + stable. This allows popular code-generating crates like Serde and Diesel to + work ergonomically. [RFC 1681]. + * [Tuple structs may be empty. Unary and empty tuple structs may be instantiated + with curly braces][36868]. Part of [RFC 1506]. + * [A number of minor changes to name resolution have been activated][37127]. + They add up to more consistent semantics, allowing for future evolution of + Rust macros. Specified in [RFC 1560], see its section on ["changes"] for + details of what is different. The breaking changes here have been transitioned + through the [`legacy_imports`] lint since 1.14, with no known regressions. + * [In `macro_rules`, `path` fragments can now be parsed as type parameter + bounds][38279] + * [`?Sized` can be used in `where` clauses][37791] + * [There is now a limit on the size of monomorphized types and it can be + modified with the `#![type_size_limit]` crate attribute, similarly to + the `#![recursion_limit]` attribute][37789] + +- Compiler changes + * [On Windows, the compiler will apply dllimport attributes when linking to + extern functions][37973]. Additional attributes and flags can control which + library kind is linked and its name. [RFC 1717]. + * [Rust-ABI symbols are no longer exported from cdylibs][38117] + * [The `--test` flag works with procedural macro crates][38107] + * [Fix `extern "aapcs" fn` ABI][37814] + * [The `-C no-stack-check` flag is deprecated][37636]. It does nothing. + * [The `format!` expander recognizes incorrect `printf` and shell-style + formatting directives and suggests the correct format][37613]. + * [Only report one error for all unused imports in an import list][37456] + +- Compiler performance + * [Avoid unnecessary `mk_ty` calls in `Ty::super_fold_with`][37705] + * [Avoid more unnecessary `mk_ty` calls in `Ty::super_fold_with`][37979] + * [Don't clone in `UnificationTable::probe`][37848] + * [Remove `scope_auxiliary` to cut RSS by 10%][37764] + * [Use small vectors in type walker][37760] + * [Macro expansion performance was improved][37701] + * [Change `HirVec>` to `HirVec` in `hir::Expr`][37642] + * [Replace FNV with a faster hash function][37229] + +- For full change list, please see + https://raw.githubusercontent.com/rust-lang/rust/master/RELEASES.md + ------------------------------------------------------------------- Tue Jan 31 09:41:33 UTC 2017 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index 9240415..003617c 100644 --- a/rust.spec +++ b/rust.spec @@ -2,6 +2,7 @@ # spec file for package rust # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 Luke Jones, luke.nukem.jones@gmail.com # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,31 +17,45 @@ # -%global prev_version 1.13.0 +%global prev_version 1.14.0 +%global abi gnu +%ifarch armv7hl +%global arch armv7 +%global abi gnueabihf +%endif +%ifarch ppc64 +%global arch powerpc64 +%endif +%ifarch ppc64le +%global arch powerpc64le +%endif +%global rust_triple %{arch}-unknown-linux-%{abi} %bcond_with bootstrap Name: rust -Version: 1.14.0 +Version: 1.15.0 Release: 0 Summary: A systems programming language License: MIT or Apache-2.0 Group: Development/Languages/Other Url: http://www.rust-lang.org Source0: https://static.rust-lang.org/dist/rustc-%{version}-src.tar.gz +Source1: config.toml Source100: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE: Set DT_SONAME when building dylibs Patch1: add-soname.patch +BuildRequires: cargo BuildRequires: cmake BuildRequires: curl BuildRequires: gcc-c++ +BuildRequires: llvm-devel +BuildRequires: procps BuildRequires: python Recommends: cargo -#FIXME: currently there's no way to have rustc and rustc-beta installed - -Obsoletes: rustc-1_9 -Provides: rustc = %{version} -Provides: rustc-stable = %{version} +Recommends: %{name}-doc +Recommends: %{name}-std Conflicts: rustc-bootstrap - +Provides: rustc = %{version} +Provides: rustc-stable = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le %if 0%{?suse_version} @@ -76,6 +91,14 @@ even though some of these abstractions feel like those of a high-level language. Even then, Rust still allows precise control like a low-level language would. +%package std +Summary: Standard library for Rust +Group: Development/Languages/Other + +%description std +This package includes the standard libraries for building +applications written in Rust. + %package doc Summary: Rust documentation Group: Development/Languages/Other @@ -87,7 +110,6 @@ Documentation for the Rust language. Summary: Gdb integration for rust binaries Group: Development/Languages/Other Supplements: packageand(%{name}:gdb) -Provides: rust-gdb = %{version} Provides: rustc:%{_bindir}/rust-gdb %description gdb @@ -95,36 +117,50 @@ This subpackage provides pretty printers and a wrapper script for invoking gdb on rust binaries. %prep -%setup -q -n rustc-%{version} +%setup -q -n rustc-%{version}-src %patch1 -p1 %build export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint # FIXME: you should use the %%configure macro ./configure \ + --build=%{rust_triple} \ + --host=%{rust_triple} \ + --target=%{rust_triple} \ --enable-local-rust \ --local-rust-root=%{_prefix} \ --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --docdir=%{_docdir}/%{name} \ + --disable-rpath \ + --disable-codegen-tests \ + --disable-rustbuild \ + --enable-vendor \ --release-channel=stable make %{?_smp_mflags} %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install # Remove executable permission from HTML documentation # to prevent RPMLINT errors. -chmod -R -x+X %{buildroot}%{_datadir}/doc/rust/html - -# Remove files which mention buildroot to prevent RPMLINT errors. -rm %{buildroot}%{_prefix}/lib/rustlib/manifest-rust* -rm %{buildroot}%{_prefix}/lib/rustlib/install.log +chmod -R -x+X %{buildroot}%{_docdir}/%{name}/html +# Remove surplus files +rm %{buildroot}%{_libdir}/rustlib/components +rm %{buildroot}%{_libdir}/rustlib/manifest-rust* +rm %{buildroot}%{_libdir}/rustlib/install.log +rm %{buildroot}%{_libdir}/rustlib/uninstall.sh # Remove lockfile to avoid errors. -rm %{buildroot}%{_datadir}/doc/rust/html/.lock +rm %{buildroot}%{_docdir}/%{name}/html/.lock -# allow parallel installation of docs -mv %{buildroot}%{_datadir}/doc/rust \ - %{buildroot}%{_datadir}/doc/rust-%{version} +# The remaining shared libraries should be executable for debuginfo extraction. +find %{buildroot}/%{_libdir}/ -type f -name '*.so' -exec chmod -v +x '{}' '+' + +# extract bundled licenses for packaging - From fedora spec +cp src/rt/hoedown/LICENSE src/rt/hoedown/LICENSE-hoedown +sed -e '/*\//q' src/libbacktrace/backtrace.h \ + >src/libbacktrace/LICENSE-libbacktrace %if 0%{?suse_version} %fdupes %{buildroot}%{_prefix} @@ -135,23 +171,60 @@ mv %{buildroot}%{_datadir}/doc/rust \ %files %defattr(-,root,root,-) +%license COPYRIGHT LICENSE-APACHE LICENSE-MIT +%license src/libbacktrace/LICENSE-libbacktrace +%license src/rt/hoedown/LICENSE-hoedown +%doc README.md %{_bindir}/rustc %{_bindir}/rustdoc -%{_mandir}/*/rust* -%exclude %{_datadir}/doc/rust -%{_prefix}/lib/*.so -%{_prefix}/lib/rustlib -%exclude %{_prefix}/lib/rustlib%{_sysconfdir}/gdb_load_rust_pretty_printers.py -%exclude %{_prefix}/lib/rustlib%{_sysconfdir}/gdb_rust_pretty_printing.py +%{_mandir}/man1/rustc.1* +%{_mandir}/man1/rustdoc.1* +%{_libdir}/lib* +%exclude %{_docdir} +%exclude %{_libdir}/rustlib -%files doc +%files std %defattr(-,root,root) -%{_datadir}/doc/rust-%{version} +%dir %{_libdir}/rustlib +%dir %{_libdir}/rustlib/%{rust_triple} +%dir %{_libdir}/rustlib/%{rust_triple}/lib +%{_libdir}/rustlib/%{rust_triple}/lib/*.rlib %files gdb %defattr(-,root,root,-) %{_bindir}/rust-gdb -%{_prefix}/lib/rustlib%{_sysconfdir}/gdb_load_rust_pretty_printers.py -%{_prefix}/lib/rustlib%{_sysconfdir}/gdb_rust_pretty_printing.py +%dir %{_libdir}/rustlib +%dir %{_libdir}/rustlib/etc +%{_libdir}/rustlib%{_sysconfdir}/debugger_pretty_printers_common.py +%{_libdir}/rustlib%{_sysconfdir}/gdb_load_rust_pretty_printers.py +%{_libdir}/rustlib%{_sysconfdir}/gdb_rust_pretty_printing.py + +%files doc +%defattr(-,root,root) +%license %{_docdir}/%{name}/html/FiraSans-LICENSE.txt +%license %{_docdir}/%{name}/html/Heuristica-LICENSE.txt +%license %{_docdir}/%{name}/html/LICENSE-APACHE.txt +%license %{_docdir}/%{name}/html/LICENSE-MIT.txt +%license %{_docdir}/%{name}/html/SourceCodePro-LICENSE.txt +%license %{_docdir}/%{name}/html/SourceSerifPro-LICENSE.txt +%dir %{_docdir}/%{name} +%dir %{_docdir}/%{name}/html +%doc %{_docdir}/%{name}/html/alloc +%doc %{_docdir}/%{name}/html/book +%doc %{_docdir}/%{name}/html/collections +%doc %{_docdir}/%{name}/html/core +%doc %{_docdir}/%{name}/html/extra +%doc %{_docdir}/%{name}/html/implementors +%doc %{_docdir}/%{name}/html/libc +%doc %{_docdir}/%{name}/html/nomicon +%doc %{_docdir}/%{name}/html/src +%doc %{_docdir}/%{name}/html/std +%doc %{_docdir}/%{name}/html/std_unicode +%doc %{_docdir}/%{name}/html/COPYRIGHT.txt +%doc %{_docdir}/%{name}/html/*.html +%doc %{_docdir}/%{name}/html/*.inc +%doc %{_docdir}/%{name}/html/*.woff +%doc %{_docdir}/%{name}/html/*.js +%doc %{_docdir}/%{name}/html/*.css %changelog diff --git a/rustc-1.14.0-src.tar.gz b/rustc-1.14.0-src.tar.gz deleted file mode 100644 index 313364c..0000000 --- a/rustc-1.14.0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c790edd2e915bd01bea46122af2942108479a2fda9a6f76d1094add520ac3b6b -size 27572650 diff --git a/rustc-1.15.0-src.tar.gz b/rustc-1.15.0-src.tar.gz new file mode 100644 index 0000000..b831ece --- /dev/null +++ b/rustc-1.15.0-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33f3747d231ede34b56c6cc0ae6be8cbaa29d2fdb39d86f25693dceb9fc5f164 +size 28100811 From a1ecdbb883b0fa99c18b4f47ba7d06f9fda649f0db6616bba5f4a794427cd797 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 6 Feb 2017 08:28:22 +0000 Subject: [PATCH 04/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=36 --- rust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 003617c..fa96b0a 100644 --- a/rust.spec +++ b/rust.spec @@ -50,9 +50,9 @@ BuildRequires: gcc-c++ BuildRequires: llvm-devel BuildRequires: procps BuildRequires: python -Recommends: cargo Recommends: %{name}-doc Recommends: %{name}-std +Recommends: cargo Conflicts: rustc-bootstrap Provides: rustc = %{version} Provides: rustc-stable = %{version} From b925753ed94da8d04b1a92cdf0a95f230dbd6ae1318d7c136639d1c8753e0c09 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 6 Feb 2017 08:38:07 +0000 Subject: [PATCH 05/30] Correct the rust-triples by removing them for now. Rely on OBS - Remove rust-triples to rely on OBS OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=37 --- rust.changes | 5 +++++ rust.spec | 23 ++++------------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/rust.changes b/rust.changes index 38e527d..c9d8cb5 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 6 08:36:44 UTC 2017 - luke.nukem.jones@gmail.com + +- Remove rust-triples to rely on OBS + ------------------------------------------------------------------- Mon Feb 6 08:25:17 UTC 2017 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index fa96b0a..3ea023c 100644 --- a/rust.spec +++ b/rust.spec @@ -18,18 +18,6 @@ %global prev_version 1.14.0 -%global abi gnu -%ifarch armv7hl -%global arch armv7 -%global abi gnueabihf -%endif -%ifarch ppc64 -%global arch powerpc64 -%endif -%ifarch ppc64le -%global arch powerpc64le -%endif -%global rust_triple %{arch}-unknown-linux-%{abi} %bcond_with bootstrap Name: rust Version: 1.15.0 @@ -50,9 +38,9 @@ BuildRequires: gcc-c++ BuildRequires: llvm-devel BuildRequires: procps BuildRequires: python +Recommends: cargo Recommends: %{name}-doc Recommends: %{name}-std -Recommends: cargo Conflicts: rustc-bootstrap Provides: rustc = %{version} Provides: rustc-stable = %{version} @@ -124,9 +112,6 @@ invoking gdb on rust binaries. export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint # FIXME: you should use the %%configure macro ./configure \ - --build=%{rust_triple} \ - --host=%{rust_triple} \ - --target=%{rust_triple} \ --enable-local-rust \ --local-rust-root=%{_prefix} \ --prefix=%{_prefix} \ @@ -186,9 +171,9 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \ %files std %defattr(-,root,root) %dir %{_libdir}/rustlib -%dir %{_libdir}/rustlib/%{rust_triple} -%dir %{_libdir}/rustlib/%{rust_triple}/lib -%{_libdir}/rustlib/%{rust_triple}/lib/*.rlib +%dir %{_libdir}/rustlib/*-unknown-linux-* +%dir %{_libdir}/rustlib/*-unknown-linux-*/lib +%{_libdir}/rustlib/*-unknown-linux-*/lib/*.rlib %files gdb %defattr(-,root,root,-) From fcd2e997b07b71549f8edd40fb092e969ed4ef0ab86e1200e97eeba08740e365 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 6 Feb 2017 09:07:11 +0000 Subject: [PATCH 06/30] Correct rust-triples use in spec. OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=38 --- rust.changes | 4 ++-- rust.spec | 29 +++++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/rust.changes b/rust.changes index c9d8cb5..e47db2f 100644 --- a/rust.changes +++ b/rust.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Mon Feb 6 08:36:44 UTC 2017 - luke.nukem.jones@gmail.com +Mon Feb 6 09:05:39 UTC 2017 - luke.nukem.jones@gmail.com -- Remove rust-triples to rely on OBS +- Correct rust-triples use in spec. ------------------------------------------------------------------- Mon Feb 6 08:25:17 UTC 2017 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index 3ea023c..6774390 100644 --- a/rust.spec +++ b/rust.spec @@ -18,6 +18,24 @@ %global prev_version 1.14.0 +%global abi gnu +%ifarch armv7hl +%global arch armv7 +%global abi gnueabihf +%endif +%ifarch ppc64 +%global arch powerpc64 +%endif +%ifarch ppc64le +%global arch powerpc64le +%endif +%ifarch x86_64 +%global arch x86_64 +%endif +%ifarch %{ix86} +%global arch %{ix86} +%endif +%global rust_triple %{_arch}-unknown-linux-%{abi} %bcond_with bootstrap Name: rust Version: 1.15.0 @@ -111,7 +129,10 @@ invoking gdb on rust binaries. %build export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint # FIXME: you should use the %%configure macro -./configure \ +%configure --disable-option-checking \ + --build=%{rust_triple} + --host=%{rust_triple} + --target=%{rust_triple} \ --enable-local-rust \ --local-rust-root=%{_prefix} \ --prefix=%{_prefix} \ @@ -171,9 +192,9 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \ %files std %defattr(-,root,root) %dir %{_libdir}/rustlib -%dir %{_libdir}/rustlib/*-unknown-linux-* -%dir %{_libdir}/rustlib/*-unknown-linux-*/lib -%{_libdir}/rustlib/*-unknown-linux-*/lib/*.rlib +%dir %{_libdir}/rustlib/%{rust_triple} +%dir %{_libdir}/rustlib/%{rust_triple}/lib +%{_libdir}/rustlib/%{rust_triple}/lib/*.rlib %files gdb %defattr(-,root,root,-) From 18379fe6cd31c80b2bde91f261f8a0db411b03859d3678038049a02e9a2800e4 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 6 Feb 2017 09:09:48 +0000 Subject: [PATCH 07/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=39 --- rust.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index 6774390..2151c69 100644 --- a/rust.spec +++ b/rust.spec @@ -130,8 +130,8 @@ invoking gdb on rust binaries. export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint # FIXME: you should use the %%configure macro %configure --disable-option-checking \ - --build=%{rust_triple} - --host=%{rust_triple} + --build=%{rust_triple} \ + --host=%{rust_triple} \ --target=%{rust_triple} \ --enable-local-rust \ --local-rust-root=%{_prefix} \ From 3c4f703ca13d81fddeec22e955909a5e89f6bd159fc63d7d1c9799f8f5008ffc Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 6 Feb 2017 09:13:27 +0000 Subject: [PATCH 08/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=40 --- rust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 2151c69..79cb8a2 100644 --- a/rust.spec +++ b/rust.spec @@ -33,7 +33,7 @@ %global arch x86_64 %endif %ifarch %{ix86} -%global arch %{ix86} +%global arch i586 %endif %global rust_triple %{_arch}-unknown-linux-%{abi} %bcond_with bootstrap From b392518f2eef87749fc935e01411b7cf2ea91fe5dcb9e6fe8bb5429a66bad322 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 6 Feb 2017 09:56:52 +0000 Subject: [PATCH 09/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=41 --- rust.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rust.spec b/rust.spec index 79cb8a2..3c9110e 100644 --- a/rust.spec +++ b/rust.spec @@ -20,20 +20,20 @@ %global prev_version 1.14.0 %global abi gnu %ifarch armv7hl -%global arch armv7 +%global _arch armv7 %global abi gnueabihf %endif %ifarch ppc64 -%global arch powerpc64 +%global _arch powerpc64 %endif %ifarch ppc64le -%global arch powerpc64le +%global _arch powerpc64le %endif %ifarch x86_64 -%global arch x86_64 +%global _arch x86_64 %endif %ifarch %{ix86} -%global arch i586 +%global _arch i586 %endif %global rust_triple %{_arch}-unknown-linux-%{abi} %bcond_with bootstrap From 524223508d222832596eafc121c1b677724022d4c0d840ea6dd98afd85643c77 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Wed, 8 Feb 2017 01:48:10 +0000 Subject: [PATCH 10/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=42 --- rust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 3c9110e..dd55936 100644 --- a/rust.spec +++ b/rust.spec @@ -36,7 +36,7 @@ %global _arch i586 %endif %global rust_triple %{_arch}-unknown-linux-%{abi} -%bcond_with bootstrap +%bcond_without bootstrap Name: rust Version: 1.15.0 Release: 0 From 9c2ce4d768ac3a39998ef03f700b7e6c5e609df02070221b34f7d099fc4895d9 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Wed, 8 Feb 2017 04:40:17 +0000 Subject: [PATCH 11/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=43 --- rust.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index dd55936..453219b 100644 --- a/rust.spec +++ b/rust.spec @@ -36,6 +36,7 @@ %global _arch i586 %endif %global rust_triple %{_arch}-unknown-linux-%{abi} +# to bootstrap, change to bcond_without %bcond_without bootstrap Name: rust Version: 1.15.0 @@ -49,7 +50,6 @@ Source1: config.toml Source100: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE: Set DT_SONAME when building dylibs Patch1: add-soname.patch -BuildRequires: cargo BuildRequires: cmake BuildRequires: curl BuildRequires: gcc-c++ @@ -68,14 +68,17 @@ ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le BuildRequires: fdupes %endif %ifnarch %{ix86} x86_64 +BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap >= %{prev_version} %else %if %{with bootstrap} +BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap >= %{prev_version} %else %if %{without bootstrap} +BuildRequires: cargo BuildRequires: rust <= %{version} BuildRequires: rust >= %{prev_version} %endif @@ -233,4 +236,4 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \ %doc %{_docdir}/%{name}/html/*.js %doc %{_docdir}/%{name}/html/*.css -%changelog +%changelog \ No newline at end of file From 11c368c36978be8577e2e53544cf5160db97471d0ec187d8cf94d40dc438fe6d Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Wed, 8 Feb 2017 04:49:48 +0000 Subject: [PATCH 12/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=44 --- _constraints | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_constraints b/_constraints index 966a08b..7a401ec 100644 --- a/_constraints +++ b/_constraints @@ -1,8 +1,9 @@ + 8 - 4000 + 4 40 From 4db3205f933941fbd96d00bd98ce5558e913941ccc0c5b5737abccc6901bfdda Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Fri, 10 Feb 2017 20:47:02 +0000 Subject: [PATCH 13/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=45 --- rust.spec | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/rust.spec b/rust.spec index 453219b..4105579 100644 --- a/rust.spec +++ b/rust.spec @@ -131,7 +131,6 @@ invoking gdb on rust binaries. %build export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint -# FIXME: you should use the %%configure macro %configure --disable-option-checking \ --build=%{rust_triple} \ --host=%{rust_triple} \ @@ -139,7 +138,7 @@ export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint --enable-local-rust \ --local-rust-root=%{_prefix} \ --prefix=%{_prefix} \ - --libdir=%{_libdir} \ + --libdir=%{_prefix}/lib \ --docdir=%{_docdir}/%{name} \ --disable-rpath \ --disable-codegen-tests \ @@ -156,15 +155,15 @@ make %{?_smp_mflags} chmod -R -x+X %{buildroot}%{_docdir}/%{name}/html # Remove surplus files -rm %{buildroot}%{_libdir}/rustlib/components -rm %{buildroot}%{_libdir}/rustlib/manifest-rust* -rm %{buildroot}%{_libdir}/rustlib/install.log -rm %{buildroot}%{_libdir}/rustlib/uninstall.sh +rm %{buildroot}%{_prefix}/lib/rustlib/components +rm %{buildroot}%{_prefix}/lib/rustlib/manifest-rust* +rm %{buildroot}%{_prefix}/lib/rustlib/install.log +rm %{buildroot}%{_prefix}/lib/rustlib/uninstall.sh # Remove lockfile to avoid errors. rm %{buildroot}%{_docdir}/%{name}/html/.lock # The remaining shared libraries should be executable for debuginfo extraction. -find %{buildroot}/%{_libdir}/ -type f -name '*.so' -exec chmod -v +x '{}' '+' +find %{buildroot}/%{_prefix}/lib/ -type f -name '*.so' -exec chmod -v +x '{}' '+' # extract bundled licenses for packaging - From fedora spec cp src/rt/hoedown/LICENSE src/rt/hoedown/LICENSE-hoedown @@ -188,25 +187,25 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \ %{_bindir}/rustdoc %{_mandir}/man1/rustc.1* %{_mandir}/man1/rustdoc.1* -%{_libdir}/lib* +%{_prefix}/lib/lib* %exclude %{_docdir} -%exclude %{_libdir}/rustlib +%exclude %{_prefix}/lib/rustlib %files std %defattr(-,root,root) -%dir %{_libdir}/rustlib -%dir %{_libdir}/rustlib/%{rust_triple} -%dir %{_libdir}/rustlib/%{rust_triple}/lib -%{_libdir}/rustlib/%{rust_triple}/lib/*.rlib +%dir %{_prefix}/lib/rustlib +%dir %{_prefix}/lib/rustlib/%{rust_triple} +%dir %{_prefix}/lib/rustlib/%{rust_triple}/lib +%{_prefix}/lib/rustlib/%{rust_triple}/lib/*.rlib %files gdb %defattr(-,root,root,-) %{_bindir}/rust-gdb -%dir %{_libdir}/rustlib -%dir %{_libdir}/rustlib/etc -%{_libdir}/rustlib%{_sysconfdir}/debugger_pretty_printers_common.py -%{_libdir}/rustlib%{_sysconfdir}/gdb_load_rust_pretty_printers.py -%{_libdir}/rustlib%{_sysconfdir}/gdb_rust_pretty_printing.py +%dir %{_prefix}/lib/rustlib +%dir %{_prefix}/lib/rustlib/etc +%{_prefix}/lib/rustlib%{_sysconfdir}/debugger_pretty_printers_common.py +%{_prefix}/lib/rustlib%{_sysconfdir}/gdb_load_rust_pretty_printers.py +%{_prefix}/lib/rustlib%{_sysconfdir}/gdb_rust_pretty_printing.py %files doc %defattr(-,root,root) From 15728433fa25212076d57a64f9302b01c67ab7fefe945c3a067e4676f67b2b6d Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Fri, 10 Feb 2017 20:50:37 +0000 Subject: [PATCH 14/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=46 --- rust.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index 4105579..33e81cf 100644 --- a/rust.spec +++ b/rust.spec @@ -37,7 +37,7 @@ %endif %global rust_triple %{_arch}-unknown-linux-%{abi} # to bootstrap, change to bcond_without -%bcond_without bootstrap +%bcond_with bootstrap Name: rust Version: 1.15.0 Release: 0 @@ -79,7 +79,7 @@ BuildRequires: rustc-bootstrap >= %{prev_version} %else %if %{without bootstrap} BuildRequires: cargo -BuildRequires: rust <= %{version} +BuildRequires: rust <= %{prev_version} BuildRequires: rust >= %{prev_version} %endif %endif From 2b98259793499eb67957c645c4678c4ac82ccab761a65ef276dc01abf335605b Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Fri, 10 Feb 2017 20:53:47 +0000 Subject: [PATCH 15/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=47 --- rust.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index 33e81cf..61f6535 100644 --- a/rust.spec +++ b/rust.spec @@ -79,8 +79,7 @@ BuildRequires: rustc-bootstrap >= %{prev_version} %else %if %{without bootstrap} BuildRequires: cargo -BuildRequires: rust <= %{prev_version} -BuildRequires: rust >= %{prev_version} +BuildRequires: rust = %{prev_version} %endif %endif %endif From ef63fa83b1256573bbe24a6e5305169b65a11f297d63499fc01497ea80664207 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Fri, 10 Feb 2017 20:57:55 +0000 Subject: [PATCH 16/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=48 --- rust.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 61f6535..fbd5bbb 100644 --- a/rust.spec +++ b/rust.spec @@ -79,7 +79,8 @@ BuildRequires: rustc-bootstrap >= %{prev_version} %else %if %{without bootstrap} BuildRequires: cargo -BuildRequires: rust = %{prev_version} +BuildRequires: rust <= %{version} +BuildRequires: rust >= %{prev_version} %endif %endif %endif From f692d299483f5f82bedc960a37863f3d4c53c2dfb5d8e43cf05452958f8dbbb1 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Sat, 11 Feb 2017 05:21:44 +0000 Subject: [PATCH 17/30] Accepting request 456358 from home:luke_nukem:branches:devel:languages:rust OBS-URL: https://build.opensuse.org/request/show/456358 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=49 --- rust.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/rust.spec b/rust.spec index fbd5bbb..8d81752 100644 --- a/rust.spec +++ b/rust.spec @@ -36,8 +36,6 @@ %global _arch i586 %endif %global rust_triple %{_arch}-unknown-linux-%{abi} -# to bootstrap, change to bcond_without -%bcond_with bootstrap Name: rust Version: 1.15.0 Release: 0 @@ -159,6 +157,7 @@ rm %{buildroot}%{_prefix}/lib/rustlib/components rm %{buildroot}%{_prefix}/lib/rustlib/manifest-rust* rm %{buildroot}%{_prefix}/lib/rustlib/install.log rm %{buildroot}%{_prefix}/lib/rustlib/uninstall.sh +rm %{buildroot}%{_prefix}/lib/rustlib/rust-installer-version # Remove lockfile to avoid errors. rm %{buildroot}%{_docdir}/%{name}/html/.lock @@ -187,9 +186,8 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \ %{_bindir}/rustdoc %{_mandir}/man1/rustc.1* %{_mandir}/man1/rustdoc.1* -%{_prefix}/lib/lib* -%exclude %{_docdir} -%exclude %{_prefix}/lib/rustlib +%{_prefix}/lib/lib*.so +%exclude %{_docdir}/%{name}/html %files std %defattr(-,root,root) @@ -197,15 +195,16 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \ %dir %{_prefix}/lib/rustlib/%{rust_triple} %dir %{_prefix}/lib/rustlib/%{rust_triple}/lib %{_prefix}/lib/rustlib/%{rust_triple}/lib/*.rlib +%{_prefix}/lib/rustlib/%{rust_triple}/lib/*.so %files gdb %defattr(-,root,root,-) %{_bindir}/rust-gdb %dir %{_prefix}/lib/rustlib %dir %{_prefix}/lib/rustlib/etc -%{_prefix}/lib/rustlib%{_sysconfdir}/debugger_pretty_printers_common.py -%{_prefix}/lib/rustlib%{_sysconfdir}/gdb_load_rust_pretty_printers.py -%{_prefix}/lib/rustlib%{_sysconfdir}/gdb_rust_pretty_printing.py +%{_prefix}/lib/rustlib/etc/debugger_pretty_printers_common.py +%{_prefix}/lib/rustlib/etc/gdb_load_rust_pretty_printers.py +%{_prefix}/lib/rustlib/etc/gdb_rust_pretty_printing.py %files doc %defattr(-,root,root) @@ -235,4 +234,4 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \ %doc %{_docdir}/%{name}/html/*.js %doc %{_docdir}/%{name}/html/*.css -%changelog \ No newline at end of file +%changelog From 99e84864034ecdbaefb623f430327f11500e68f238094e00237fcfae0bdf4b8c Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Sat, 11 Feb 2017 07:02:13 +0000 Subject: [PATCH 18/30] Re-download source to fix Factory source check error OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=50 --- rustc-1.15.0-src.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rustc-1.15.0-src.tar.gz b/rustc-1.15.0-src.tar.gz index b831ece..11ed276 100644 --- a/rustc-1.15.0-src.tar.gz +++ b/rustc-1.15.0-src.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33f3747d231ede34b56c6cc0ae6be8cbaa29d2fdb39d86f25693dceb9fc5f164 -size 28100811 +oid sha256:f655e4fac9c2abb93eb579e29c408e46052c0e74b7655cd222c63c6743457673 +size 27560549 From afc609bcba0b88361362f9d2675df32c0a3e8bcbdf849edc4ef6dee7c4dd920c Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Sat, 11 Feb 2017 09:48:47 +0000 Subject: [PATCH 19/30] Accepting request 456385 from home:luke_nukem:branches:devel:languages:rust OBS-URL: https://build.opensuse.org/request/show/456385 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=51 --- rust.changes | 6 ++++++ rust.spec | 14 +++----------- rustc-1.15.0-src.tar.gz | 3 --- rustc-1.15.1-src.tar.gz | 3 +++ 4 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 rustc-1.15.0-src.tar.gz create mode 100644 rustc-1.15.1-src.tar.gz diff --git a/rust.changes b/rust.changes index e47db2f..0249db5 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 11 05:31:34 UTC 2017 - luke.nukem.jones@gmail.com + +- Update to 1.15.1 +- Fix IntoIter::as_mut_slice's signature + ------------------------------------------------------------------- Mon Feb 6 09:05:39 UTC 2017 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index 8d81752..3c41af9 100644 --- a/rust.spec +++ b/rust.spec @@ -37,7 +37,7 @@ %endif %global rust_triple %{_arch}-unknown-linux-%{abi} Name: rust -Version: 1.15.0 +Version: 1.15.1 Release: 0 Summary: A systems programming language License: MIT or Apache-2.0 @@ -65,22 +65,14 @@ ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le %if 0%{?suse_version} BuildRequires: fdupes %endif -%ifnarch %{ix86} x86_64 +%if %{with bootstrap} BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap >= %{prev_version} - %else - %if %{with bootstrap} -BuildRequires: cargo-bootstrap -BuildRequires: rustc-bootstrap <= %{version} -BuildRequires: rustc-bootstrap >= %{prev_version} - %else - %if %{without bootstrap} +%else BuildRequires: cargo BuildRequires: rust <= %{version} BuildRequires: rust >= %{prev_version} - %endif - %endif %endif %description diff --git a/rustc-1.15.0-src.tar.gz b/rustc-1.15.0-src.tar.gz deleted file mode 100644 index 11ed276..0000000 --- a/rustc-1.15.0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f655e4fac9c2abb93eb579e29c408e46052c0e74b7655cd222c63c6743457673 -size 27560549 diff --git a/rustc-1.15.1-src.tar.gz b/rustc-1.15.1-src.tar.gz new file mode 100644 index 0000000..59ecf1a --- /dev/null +++ b/rustc-1.15.1-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e7daad418a830b45b977cd7ecf181b65f30f73df63ff36e124ea5fe5d1af327 +size 28100203 From 217c5a47ece5de7b89a60fed027f3924e79a7af90c60cdecbf667304608f234c Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Sat, 11 Feb 2017 10:52:06 +0000 Subject: [PATCH 20/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=52 --- rust.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rust.spec b/rust.spec index 3c41af9..0e22e61 100644 --- a/rust.spec +++ b/rust.spec @@ -36,6 +36,7 @@ %global _arch i586 %endif %global rust_triple %{_arch}-unknown-linux-%{abi} +%bcond_with bootstrap Name: rust Version: 1.15.1 Release: 0 From 4960b8b57dc2de62be91e578ac9f365feb5888bda343fe9b9c27827d548118b6 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Sat, 11 Feb 2017 10:56:21 +0000 Subject: [PATCH 21/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=53 --- rust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 0e22e61..0d9f2c7 100644 --- a/rust.spec +++ b/rust.spec @@ -70,7 +70,7 @@ BuildRequires: fdupes BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap >= %{prev_version} -%else +%elif %{without bootstrap} BuildRequires: cargo BuildRequires: rust <= %{version} BuildRequires: rust >= %{prev_version} From 78bda059b892a10361b87aad5ca01b02bd59c5f97e09abd97586f7922f9969a4 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Sat, 11 Feb 2017 11:00:32 +0000 Subject: [PATCH 22/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=54 --- rust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 0d9f2c7..61beed1 100644 --- a/rust.spec +++ b/rust.spec @@ -36,7 +36,7 @@ %global _arch i586 %endif %global rust_triple %{_arch}-unknown-linux-%{abi} -%bcond_with bootstrap + Name: rust Version: 1.15.1 Release: 0 From 3694124264b0f7e752fe4c4aa64dff955a0fee0846f7e582d5cc6cbe04d2a64c Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Sat, 11 Feb 2017 18:39:02 +0000 Subject: [PATCH 23/30] Accepting request 456412 from home:luke_nukem:branches:devel:languages:rust OBS-URL: https://build.opensuse.org/request/show/456412 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=55 --- rust.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index 61beed1..c789c56 100644 --- a/rust.spec +++ b/rust.spec @@ -36,7 +36,7 @@ %global _arch i586 %endif %global rust_triple %{_arch}-unknown-linux-%{abi} - +#bcond_with bootstrap Name: rust Version: 1.15.1 Release: 0 @@ -70,7 +70,7 @@ BuildRequires: fdupes BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap >= %{prev_version} -%elif %{without bootstrap} +%else BuildRequires: cargo BuildRequires: rust <= %{version} BuildRequires: rust >= %{prev_version} From 7a34637a1f2fecad156697ea500a7c0ff60c7531283ea1d9ccc83c0f183b6d2a Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Sat, 11 Feb 2017 18:49:10 +0000 Subject: [PATCH 24/30] OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=56 --- rust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index c789c56..0e22e61 100644 --- a/rust.spec +++ b/rust.spec @@ -36,7 +36,7 @@ %global _arch i586 %endif %global rust_triple %{_arch}-unknown-linux-%{abi} -#bcond_with bootstrap +%bcond_with bootstrap Name: rust Version: 1.15.1 Release: 0 From bbd20fa1a8523c9f944637060c32145c1f2c09b24934bb5b4c1df25fb314baa2 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 13 Feb 2017 03:45:30 +0000 Subject: [PATCH 25/30] Restrict build to to use rustc n-1 version. OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=58 --- rust.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index 0e22e61..32eb2ed 100644 --- a/rust.spec +++ b/rust.spec @@ -72,8 +72,8 @@ BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap >= %{prev_version} %else BuildRequires: cargo -BuildRequires: rust <= %{version} -BuildRequires: rust >= %{prev_version} +#BuildRequires: rust <= %{version} +BuildRequires: rust == %{prev_version} %endif %description From 3e55321f2536cd1944b263795cf692d30f1023662edfe302712a3ab56870b4d5 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 13 Feb 2017 04:04:45 +0000 Subject: [PATCH 26/30] Add conditionals for ARM, aarch64, ppc64, ppc64le to build using bootstrap until n+1 version is released upstream. OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=59 --- rust.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rust.spec b/rust.spec index 32eb2ed..c3bb4b9 100644 --- a/rust.spec +++ b/rust.spec @@ -68,12 +68,15 @@ BuildRequires: fdupes %endif %if %{with bootstrap} BuildRequires: cargo-bootstrap -BuildRequires: rustc-bootstrap <= %{version} -BuildRequires: rustc-bootstrap >= %{prev_version} +BuildRequires: rustc-bootstrap == %{prev_version} %else + %ifarch %{arm} aarch64 ppc64 ppc64le +BuildRequires: cargo-bootstrap +BuildRequires: rustc-bootstrap == %{prev_version} + %else BuildRequires: cargo -#BuildRequires: rust <= %{version} BuildRequires: rust == %{prev_version} + %endif %endif %description From a0dd104efa6ff8ef8e251d988a02a15d0842c782d3d792786b4e731ab8085e81 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 13 Feb 2017 04:09:18 +0000 Subject: [PATCH 27/30] Add conditional for building for Leap 42.2 with bootstrap. OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=60 --- rust.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rust.spec b/rust.spec index c3bb4b9..62bf216 100644 --- a/rust.spec +++ b/rust.spec @@ -72,6 +72,9 @@ BuildRequires: rustc-bootstrap == %{prev_version} %else %ifarch %{arm} aarch64 ppc64 ppc64le BuildRequires: cargo-bootstrap +BuildRequires: rustc-bootstrap == %{prev_version} + %elif 0%{?leap_version} == 420200 +BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap == %{prev_version} %else BuildRequires: cargo From d95e60eefa20f21d92271ae60857b724dc6eba5ad3064c0951a276e2a4956d31 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 13 Feb 2017 04:13:22 +0000 Subject: [PATCH 28/30] Fix incorrect conditional tag OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=61 --- rust.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index 62bf216..35b1b08 100644 --- a/rust.spec +++ b/rust.spec @@ -73,12 +73,14 @@ BuildRequires: rustc-bootstrap == %{prev_version} %ifarch %{arm} aarch64 ppc64 ppc64le BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap == %{prev_version} - %elif 0%{?leap_version} == 420200 + %else + %if 0%{?leap_version} == 420200 BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap == %{prev_version} - %else + %else BuildRequires: cargo BuildRequires: rust == %{prev_version} + %endif %endif %endif From 5c434839a179c952e110dd09cac211e9163980a37e8a49e07eac72549949bae2 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 13 Feb 2017 04:23:24 +0000 Subject: [PATCH 29/30] Clean up previous modifications. OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=62 --- rust.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/rust.spec b/rust.spec index 35b1b08..f52cc9d 100644 --- a/rust.spec +++ b/rust.spec @@ -63,25 +63,22 @@ Provides: rustc = %{version} Provides: rustc-stable = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le + %if 0%{?suse_version} BuildRequires: fdupes %endif -%if %{with bootstrap} + +%ifarch %{arm} aarch64 ppc64 ppc64le BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap == %{prev_version} %else - %ifarch %{arm} aarch64 ppc64 ppc64le +%if %{with bootstrap} || 0%{?leap_version} <= 420200 BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap == %{prev_version} - %else - %if 0%{?leap_version} == 420200 -BuildRequires: cargo-bootstrap -BuildRequires: rustc-bootstrap == %{prev_version} - %else +%else BuildRequires: cargo BuildRequires: rust == %{prev_version} - %endif - %endif +%endif %endif %description From f9b6a7ce5bfb4e1d34e15945842b475327bdddf54de0d9892f7f2fb418c380a3 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 13 Feb 2017 20:36:59 +0000 Subject: [PATCH 30/30] Set conditional builds up correctly. OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=63 --- rust.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rust.spec b/rust.spec index f52cc9d..c03d057 100644 --- a/rust.spec +++ b/rust.spec @@ -62,22 +62,22 @@ Conflicts: rustc-bootstrap Provides: rustc = %{version} Provides: rustc-stable = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le s390x %if 0%{?suse_version} BuildRequires: fdupes %endif -%ifarch %{arm} aarch64 ppc64 ppc64le +%ifarch %{arm} aarch64 ppc64 ppc64le s390x BuildRequires: cargo-bootstrap -BuildRequires: rustc-bootstrap == %{prev_version} +BuildRequires: rustc-bootstrap >= %{prev_version} %else -%if %{with bootstrap} || 0%{?leap_version} <= 420200 +%if %{with bootstrap} || (0%{?suse_version} < 1330 && 0%{?sle_version} < 120300) BuildRequires: cargo-bootstrap -BuildRequires: rustc-bootstrap == %{prev_version} +BuildRequires: rustc-bootstrap >= %{prev_version} %else BuildRequires: cargo -BuildRequires: rust == %{prev_version} +BuildRequires: rust >= %{prev_version} %endif %endif