diff options
Diffstat (limited to 'community/rust')
| -rw-r--r-- | community/rust/APKBUILD | 20 | ||||
| -rw-r--r-- | community/rust/alpine-change-rpath-to-rustlib.patch | 6 | ||||
| -rw-r--r-- | community/rust/alpine-target.patch | 4 |
3 files changed, 14 insertions, 16 deletions
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD index 0f4a237580..b528cbbb14 100644 --- a/community/rust/APKBUILD +++ b/community/rust/APKBUILD @@ -3,9 +3,9 @@ # Contributor: Jeizsm <jeizsm@gmail.com> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=rust -pkgver=1.19.0 +pkgver=1.20.0 _llvmver=3.9 -_bootver=1.18.0 +_bootver=1.19.0 pkgrel=0 pkgdesc="The Rust Programming Language (compiler)" url="http://www.rust-lang.org" @@ -80,10 +80,9 @@ build() { --disable-jemalloc \ --disable-docs - make \ - RUST_BACKTRACE=1 \ + RUST_BACKTRACE=1 \ RUST_CRT_STATIC="false" \ - VERBOSE=1 + ./x.py build -v } check() { @@ -101,10 +100,9 @@ check() { package() { cd "$builddir" - make dist \ - RUST_BACKTRACE=1 \ + RUST_BACKTRACE=1 \ RUST_CRT_STATIC="false" \ - VERBOSE=1 + ./x.py dist -v local component; for component in rustc rust-std; do tar -xf "build/dist/$component-$pkgver-$CTARGET.tar.gz" @@ -168,7 +166,7 @@ _mv() { mv $@ } -sha512sums="080a8625fc15bc4fc17ab910bdcc0d9a88ce8922f1a3eb241d0f956b5799e4db6df45ebabb5497295c198be08686e5a94dff65569582fc6a5ecb9200cfee5c24 rustc-1.19.0-src.tar.gz +sha512sums="bc7dc78f4d81b7d35309d81fae2aac1f5f157eb3350e533911e79e3323a6ea056483ff0b6c63148bd8c3d070df7172374a669fbc4554e77889cfbacb5dbb46c3 rustc-1.20.0-src.tar.gz e797d4a21ffe5087e6a7c4d22302f0fbd8fdc2074195d7a0d22a8c52a1abe3269e14a3b865f26e13a4f70362922dd0dc5279d8a3d70617199705cc452181d889 musl-support-dynamic-linking.patch d4d39514eca638852307f470250fd12a21781e1e7944377744b7d50290d3a2ab3776fbdfccb7a9221f5da00ca694ac3a5b8c05f72c5e1a0c8711b684b16b1084 musl-fix-static-linking.patch 9ebfb10abb50d74ff08d257d85257ce70ac3ce834aa95a8901808497b14acf3ea898fb197de64d13554eb5feedabe9fd04fec2cc6a7bea9b1335684bfcdcd88b musl-fix-linux_musl_base.patch @@ -177,6 +175,6 @@ dc6432293bd060d5e3a73f25870867654fae61995dcd919e244a2dc686b6107556deed8c59ca6002 ff633f2a46c683ad698d1c09c98c06ce9ee9b8d55fa5593cdd485b439ebca3273794d29b5ff32b887be8666f52913a23af6e133c782bd0c4e2c88e306dd3a494 need-rpath.patch d352614e7c774e181decae210140e789de7fc090327ff371981ad28a11ce51c8c01b27c1101a24bb84d75ed2f706f67868f7dbc52196d4ccdf4ebd2d6d6b6b5e minimize-rpath.patch 498f4649163974afc4f042c43cd0c15d36784031514201a2962061f288a9336c2bc9749f8d2308b8ce3656f8097b5fc5bef505f61e2a6ed422ef4153f5339d77 alpine-move-py-scripts-to-share.patch -8d6206f8c50856724cf7b4c1854ec82547f040358a1c7d44abeacc27a5c205a963b1fec51e58ec06c68d85bd2f68a9e6e27ebe457f39e8dd043de17758f5063f alpine-change-rpath-to-rustlib.patch -e9935f88f959d37da9e696f2722569bc6da6ed17eddc8d496af4a2ee9a561d8e40bd7644089ee26114bb920e04ff05def18d70a6f2347545500d1a23ee96eefa alpine-target.patch +0542e8ffeb7ff6017aeec84d99c14802c6536433b41dafe7c8fc0c40908548228f34ef142ad6ad94235115b05f02ce157553b470b0f242292f90f3125b249e94 alpine-change-rpath-to-rustlib.patch +3df3fc5a8d32b47489939e1f2d8277914cea6f3cd5cacf68373d7ab97b2552356f8121e2a134b473bb4715e189ddf03a7bda95cd5f05230bdeb33a5150177d68 alpine-target.patch 79549055dea81379c890b495c82456ab497a9179ec6702c59e11d0748bc668f47fc3d6a69c27a0545bb87c01318631dffc69260bf2d4badc75f53cbf7fad7528 check-rustc" diff --git a/community/rust/alpine-change-rpath-to-rustlib.patch b/community/rust/alpine-change-rpath-to-rustlib.patch index 4be0f9d0a6..bd65efd7d9 100644 --- a/community/rust/alpine-change-rpath-to-rustlib.patch +++ b/community/rust/alpine-change-rpath-to-rustlib.patch @@ -23,10 +23,8 @@ Related upstream issues: --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs -@@ -189,9 +189,9 @@ - if stage != "0" { - cmd.arg("-Z").arg("osx-rpath-install-name"); - } +@@ -189,7 +189,7 @@ + cmd.arg("-Z").arg("osx-rpath-install-name"); - Some("-Wl,-rpath,@loader_path/../lib") + Some("-Wl,-rpath,@loader_path/../lib".to_string()) } else if !target.contains("windows") { diff --git a/community/rust/alpine-target.patch b/community/rust/alpine-target.patch index fc79b45b9a..90bf453f32 100644 --- a/community/rust/alpine-target.patch +++ b/community/rust/alpine-target.patch @@ -45,10 +45,12 @@ 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 -@@ -214,6 +214,9 @@ +@@ -214,8 +214,11 @@ ("thumbv7m-none-eabi", thumbv7m_none_eabi), ("thumbv7em-none-eabi", thumbv7em_none_eabi), ("thumbv7em-none-eabihf", thumbv7em_none_eabihf), + + ("msp430-none-elf", msp430_none_elf), + + ("i586-alpine-linux-musl", i586_alpine_linux_musl), + ("x86_64-alpine-linux-musl", x86_64_alpine_linux_musl), |