diff options
author | Rasmus Thomsen <oss@cogitri.dev> | 2019-05-24 00:44:00 +0200 |
---|---|---|
committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-05-26 17:00:30 +0000 |
commit | 9da87c88454379df97a1a065daa14ed1d5817f29 (patch) | |
tree | b5776dc2227a46301f7b5a5207c8376f8e888a0a | |
parent | fdc9f037db8cfd09b1874ac0682821aa28c2ce51 (diff) | |
download | aports-9da87c88454379df97a1a065daa14ed1d5817f29.tar.bz2 aports-9da87c88454379df97a1a065daa14ed1d5817f29.tar.xz |
community/rust: upgrade to 1.34.2
* Adopt maintainership
Closes GH-8057
-rw-r--r-- | community/rust/APKBUILD | 12 | ||||
-rw-r--r-- | community/rust/alpine-target.patch | 8 | ||||
-rw-r--r-- | community/rust/minimize-rpath.patch | 9 |
3 files changed, 14 insertions, 15 deletions
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD index 5a892352d8..a422010a75 100644 --- a/community/rust/APKBUILD +++ b/community/rust/APKBUILD @@ -2,11 +2,11 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Shiz <hi@shiz.me> # Contributor: Jeizsm <jeizsm@gmail.com> -# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=rust -pkgver=1.33.0 +pkgver=1.34.2 _llvmver=7 -_bootver=1.32.0 +_bootver=1.33.0 pkgrel=0 pkgdesc="The Rust Programming Language" url="http://www.rust-lang.org" @@ -257,16 +257,16 @@ _mv() { mv "$@" } -sha512sums="65ae2615f4639ccea146fc431aca62e6f0793aa5e584e786e706eefb30588056080300fd5752ce9226067dc213f1a468f96c21b2334f22c5751fa90ddbd3a2b4 rustc-1.33.0-src.tar.gz +sha512sums="a9483c937915c482c9bebb1c60769a43978456ee222f3ff1379790cebc18dc4140b8b4d0a077dd1a5051f3c07113388597731e01f82c2f2b5b709e21cde3ecb3 rustc-1.34.2-src.tar.gz 6713d0d0ccac6b17ed47e486c6d74d1f913887bf88d42527576188fa98063a33a1ea903967847d52126b996f965577f1311344d6e57063b1625221847290a0ed musl-fix-static-linking.patch a2871fa75fb63570031eda80390461a137fe31ba82bf253caeabf3fb6673b4c80b535917dde139a300fb6d5f8c14fe09c8f7aaf4a506ef5e837540cf00aaa977 musl-fix-linux_musl_base.patch e40d41a6dc5d400d6672f1836cd5b9e00391f7beb52e872d87db76bc95a606ce6aaae737a0256a1e5fba77c83bb223818d214dbe87028d47be65fb43c101595c llvm-with-ffi.patch 5490ba8d78e55ce24c1a4f152604a38066079f9fec0bb41184c5ef279092b45ecc67cba00995c9a3f594b5eacee88a330c6836d755b5c895b87a64579d33febe static-pie.patch b7931281bfc1deb25c72494b4111500fe46c2e551ca32cafdfcc9a1bff657ca0b2bfaeea52260b4604678403fc76a708c2416bfc9e5bdac04475c4a70602295b need-rpath.patch -00f868748eb76f393f32fa7ef3e670a0578884cf81dc905accf546ea1b55e10eb9b731a867cb3b1554b9b609309fd10153d2ae3c0c11cc3bf6be6cdce41fe36d minimize-rpath.patch +9b5ac7dc9acc644a7415e0510a97910b3b7191e858b03d891532631d3f64427792b5b482fe6c748627209993349e9246551b7ebbd462565ac7460fd1652ee38f minimize-rpath.patch 35e0619672843d9dd41df4a086404a59b57c12fa014e42d06102bc3856a96ed021e716f9d581ec5c89444acbaedd3edcd2b8a85576df3bb4451c0edde3afbba5 alpine-move-py-scripts-to-share.patch 4f5746acb08c18f749691a8455cc81ea2e9a361621790b006b884c9c895ab9e51a001b6638bed071a9af5c232ed8d1b43c58260839a3f6dce4eec3f495ce4348 alpine-change-rpath-to-rustlib.patch -1c5ef78ee210e3966e49eae3b43986bc04341a818c240ef39979046bb41d191139bc5d5f7048a83d8b8210b4ec9655d4882692cdb1711edc8da620216a67d36a alpine-target.patch +616e3d036e310d61f5a212aa25f46b8fa5c31ad637ba774123334d685684f2c87b25b40cdb33dc08e660a9a7593fee29aa55d0f166e6a9173236cb3a6af408aa alpine-target.patch 7d59258d4462eba0207739a5c0c8baf1f19d9a396e5547bb4d59d700eb94d50ba6add2e523f3e94e29e993821018594625ea4ac86304fb58f7f8c82622a26ab0 install-template-shebang.patch c2ccab15d48c11cc3af549a3944ca0d29cb3790345468f4f3779e5ac931554dea603e5523281fc391ba4a555ee468b516961c4cb8ecee007eadacf114f3d8758 bootstrap-tool-respect-tool-config.patch 3d6f027088e1ec189ce864bf5ed150ccad8be5d9fc0973f1b4d202eec6eab865834403335a9f0765bbfa54638aed7f5d5f2183ba9dfeab9f5bc4ef48111a8427 cargo-tests-ignore-resolving_minimum_version_with_transitive_deps.patch diff --git a/community/rust/alpine-target.patch b/community/rust/alpine-target.patch index 66c8345f2f..baffdede76 100644 --- a/community/rust/alpine-target.patch +++ b/community/rust/alpine-target.patch @@ -33,7 +33,7 @@ and distribution-specific quirks instead of polluting the main musl target of +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use spec::{LinkerFlavor, Target, TargetResult}; ++use crate::spec::{LinkerFlavor, Target, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::linux_musl_base::opts(); @@ -71,7 +71,7 @@ and distribution-specific quirks instead of polluting the main musl target of +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use spec::{LinkerFlavor, Target, TargetResult}; ++use crate::spec::{LinkerFlavor, Target, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::linux_musl_base::opts(); @@ -109,7 +109,7 @@ and distribution-specific quirks instead of polluting the main musl target of +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; ++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::linux_musl_base::opts(); @@ -148,7 +148,7 @@ and distribution-specific quirks instead of polluting the main musl target of +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; ++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::linux_musl_base::opts(); diff --git a/community/rust/minimize-rpath.patch b/community/rust/minimize-rpath.patch index 8d3be50cbe..1d89d7d5af 100644 --- a/community/rust/minimize-rpath.patch +++ b/community/rust/minimize-rpath.patch @@ -31,7 +31,7 @@ and skip it there. @@ -87,11 +88,13 @@ } - fn get_rpaths_relative_to_output(config: &mut RPathConfig, + fn get_rpaths_relative_to_output(config: &mut RPathConfig<'_>, - libs: &[PathBuf]) -> Vec<String> { - libs.iter().map(|a| get_rpath_relative_to_output(config, a)).collect() + libs: &[PathBuf], @@ -39,15 +39,15 @@ and skip it there. + libs.iter().filter_map(|a| get_rpath_relative_to_output(config, a, omit)).collect() } --fn get_rpath_relative_to_output(config: &mut RPathConfig, lib: &Path) -> String { -+fn get_rpath_relative_to_output(config: &mut RPathConfig, lib: &Path, +-fn get_rpath_relative_to_output(config: &mut RPathConfig<'_>, lib: &Path) -> String { ++fn get_rpath_relative_to_output(config: &mut RPathConfig<'_>, lib: &Path, + omit: &Vec<String>) -> Option<String> { // Mac doesn't appear to support $ORIGIN let prefix = if config.is_like_osx { "@loader_path" @@ -105,10 +108,16 @@ let mut output = cwd.join(&config.out_filename); - output.pop(); + output.pop(); // strip filename let output = fs::canonicalize(&output).unwrap_or(output); - let relative = path_relative_from(&lib, &output).unwrap_or_else(|| - panic!("couldn't create relative path from {:?} to {:?}", output, lib)); @@ -97,4 +97,3 @@ and skip it there. assert_eq!(res, "$ORIGIN/../lib"); } } - |