diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-02-17 15:49:38 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-02-17 16:08:01 +0100 |
| commit | a219ac840baa4a64208f6199d066febd552b74c3 (patch) | |
| tree | 0469e6f7d9057a16be3106cd4a0177a4961fc934 | |
| parent | 299dd9bd2933111f02c9c9f6648de06ad11d54f5 (diff) | |
| download | aports-a219ac840baa4a64208f6199d066febd552b74c3.tar.bz2 aports-a219ac840baa4a64208f6199d066febd552b74c3.tar.xz | |
community/rust: upgrade to 1.24.0
| -rw-r--r-- | community/rust/APKBUILD | 14 | ||||
| -rw-r--r-- | community/rust/alpine-target.patch | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD index 02671af2a3..f44b3806d9 100644 --- a/community/rust/APKBUILD +++ b/community/rust/APKBUILD @@ -3,10 +3,10 @@ # Contributor: Jeizsm <jeizsm@gmail.com> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=rust -pkgver=1.23.0 +pkgver=1.24.0 _llvmver=4 -_bootver=1.22.0 -pkgrel=1 +_bootver=1.23.0 +pkgrel=0 pkgdesc="The Rust Programming Language" url="http://www.rust-lang.org" arch="x86_64" @@ -25,8 +25,10 @@ makedepends="rust>=$_bootver cargo cmake file libffi-dev llvm$_llvmver-dev llvm$_llvmver-test-utils python2 tar zlib-dev" +# Note: -src is noarch in principle, but it contains some testing binaries, +# so we can't mark it as noarch. subpackages="$pkgname-dbg $pkgname-stdlib - $pkgname-gdb::noarch $pkgname-lldb::noarch $pkgname-doc $pkgname-src::noarch" + $pkgname-gdb::noarch $pkgname-lldb::noarch $pkgname-doc $pkgname-src" source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz musl-fix-static-linking.patch musl-fix-linux_musl_base.patch @@ -179,7 +181,7 @@ _mv() { mv $@ } -sha512sums="a1dbb1a625c6d8dfe9708e1cf478a49154b1eb0aba5ba67ac85518a8c7d1c70d2d86ac4d441156e9bfd0fd77ca241fb5491a2bd68aefcf0b3c2e164c3cc29e4e rustc-1.23.0-src.tar.gz +sha512sums="c879547bef9cd1b0ed1055cc0198fc79d16689a2ed24e783990b5626863a8e9953403470dfad0a18ea7cddea82f837f3e29cd155b155aa2bf3fd1328fc98e622 rustc-1.24.0-src.tar.gz cee98ff6cded8a330e383b8b88423b10b7c2cdcb711b31f4685abae7a60f85869e87f3096eb2d90a83dafeeba98b6f153b5e67d88f5cacc368dc53c701fe495b musl-fix-static-linking.patch 360b0c1b6374cb356989b6f254da2dfc2ab2390c8251f0151492206b908ebf85c6ff57405394b3f46f1fc3e26f7c986bb9e924065f4c4dfa1d50fff2a99b5cd0 musl-fix-linux_musl_base.patch dc6432293bd060d5e3a73f25870867654fae61995dcd919e244a2dc686b6107556deed8c59ca6002182bfeff5ebc1ca2b89c4028ab0fbfb79e65defe47c9b4b0 llvm-with-ffi.patch @@ -188,6 +190,6 @@ b5c8a4faf3571b5c79b052103639ea3b14f094ec0999963602111608afa1159219f958decf0b45dd d352614e7c774e181decae210140e789de7fc090327ff371981ad28a11ce51c8c01b27c1101a24bb84d75ed2f706f67868f7dbc52196d4ccdf4ebd2d6d6b6b5e minimize-rpath.patch 498f4649163974afc4f042c43cd0c15d36784031514201a2962061f288a9336c2bc9749f8d2308b8ce3656f8097b5fc5bef505f61e2a6ed422ef4153f5339d77 alpine-move-py-scripts-to-share.patch 0542e8ffeb7ff6017aeec84d99c14802c6536433b41dafe7c8fc0c40908548228f34ef142ad6ad94235115b05f02ce157553b470b0f242292f90f3125b249e94 alpine-change-rpath-to-rustlib.patch -412bb856ce474c2a027d29be5dc9bbe6475ecf92fdf21c5b05f3aa234b86626652d582e7197681a52fff5e3c29b456137edb7b2dfa3a4346a6b3b487dfff7fa5 alpine-target.patch +9b451a7c4a761ff7e5f269cd5f84e59afbaedc8ef5d1d053cd3e315ce8d99f1a25fa7291e5dacb3cfbac32b4d15518a616bd703ab28844484285929e71dd2720 alpine-target.patch 7d59258d4462eba0207739a5c0c8baf1f19d9a396e5547bb4d59d700eb94d50ba6add2e523f3e94e29e993821018594625ea4ac86304fb58f7f8c82622a26ab0 install-template-shebang.patch 79549055dea81379c890b495c82456ab497a9179ec6702c59e11d0748bc668f47fc3d6a69c27a0545bb87c01318631dffc69260bf2d4badc75f53cbf7fad7528 check-rustc" diff --git a/community/rust/alpine-target.patch b/community/rust/alpine-target.patch index 4bb2173e5a..8b3a914ab4 100644 --- a/community/rust/alpine-target.patch +++ b/community/rust/alpine-target.patch @@ -9,12 +9,10 @@ and distribution-specific quirks instead of polluting the main musl target of --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs -@@ -223,8 +223,13 @@ - ("thumbv7m-none-eabi", thumbv7m_none_eabi), - ("thumbv7em-none-eabi", thumbv7em_none_eabi), - ("thumbv7em-none-eabihf", thumbv7em_none_eabihf), - - ("msp430-none-elf", msp430_none_elf), +@@ -234,6 +234,11 @@ + ("armv7-unknown-cloudabi-eabihf", armv7_unknown_cloudabi_eabihf), + ("i686-unknown-cloudabi", i686_unknown_cloudabi), + ("x86_64-unknown-cloudabi", x86_64_unknown_cloudabi), + + ("i586-alpine-linux-musl", i586_alpine_linux_musl), + ("x86_64-alpine-linux-musl", x86_64_alpine_linux_musl), |