diff options
Diffstat (limited to 'extra/rust')
| -rw-r--r-- | extra/rust/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/rust/config.toml.patch | 33 |
2 files changed, 29 insertions, 19 deletions
diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index e126e525..418aa7fb 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -6,7 +6,7 @@ # see https://github.com/rust-lang/rust/issues/60294 source+=(config.toml.patch) -sha256sums+=('41cb009565b592bcd73dbfbfa53e4462570c85de58b225893e8f1ff25d640a04') +sha256sums+=('a8b42b5f47c0eaebafbb2cd1f39d2f944945cbb55e87d4dc21c7bd5b1b8964d8') eval "$( declare -f prepare | \ @@ -27,9 +27,7 @@ if [ "${CARCH}" != 'pentium4' ]; then eval "$( declare -f prepare | \ sed ' - $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/src/spec/i686_unknown_linux_gnu.rs" $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs" - $ i sed -i "s/c3436efc44370b470cd00a28b44b8eca293215cc77d4308cf5f1359d5f446457/76406fba886ab0488292a47ca5c9041e3400a07237df4122e32227278bcb4780/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json" ' )" fi @@ -40,7 +38,10 @@ fi eval "$( declare -f build | \ sed ' - /mv.*i686-unknown-linux-gnu.*/d + /mkdir.*usr\/lib32/d + /ln.*x86_64.*/d + /ln.*i686-unknown-linux-gnu.*/d + /_pick.*dest-i686.*/d s/x86_64-unknown-linux-musl/i686-unknown-linux-musl/ ' )" @@ -77,7 +78,7 @@ makedepends=(${makedepends[@]//lib32-gcc-libs/}) # Enable on demand, if your previous rust is broken use previous version # from build-support #makedepends=(${makedepends[@]//rust/}) -#makedepends+=('rust-bin') +#makedepends+=('rust159-bin') -# rust 1.41 is built against llvm 9.0, so force that in as a make dependency -#makedepends+=('llvm9-libs') +# rust 1.56 is built against llvm12.0, so force that in as a make dependency +#makedepends+=('llvm12-libs') diff --git a/extra/rust/config.toml.patch b/extra/rust/config.toml.patch index 1aeb55c1..e262d277 100644 --- a/extra/rust/config.toml.patch +++ b/extra/rust/config.toml.patch @@ -1,25 +1,32 @@ diff -rauN a/config.toml b/config.toml ---- a/config.toml 2021-02-04 07:47:59.117133704 +0100 -+++ b/config.toml 2021-02-04 07:50:40.203582394 +0100 -@@ -2,7 +2,7 @@ - link-shared = true +--- a/config.toml 2021-12-09 10:47:47.487749605 +0100 ++++ b/config.toml 2021-12-09 11:12:50.904278715 +0100 +@@ -6,11 +6,10 @@ [build] --target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "x86_64-unknown-linux-musl"] -+target = ["i686-unknown-linux-gnu", "i686-unknown-linux-musl"] - tools = ["cargo", "rls", "clippy", "miri", "rustfmt", "analysis", "src"] + target = [ +- "x86_64-unknown-linux-gnu", + "i686-unknown-linux-gnu", +- "x86_64-unknown-linux-musl", ++ "i686-unknown-linux-musl", + "wasm32-unknown-unknown", +- "wasm32-wasi", ++ "wasm32-wasi" + ] cargo = "/usr/bin/cargo" rustc = "/usr/bin/rustc" -@@ -22,14 +22,14 @@ - # https://github.com/rust-lang/rust/issues/54872 - codegen-units-std = 1 +@@ -28,7 +27,7 @@ + prefix = "/usr" + [rust] -debuginfo-level-std = 2 +debuginfo-level-std = 0 - channel = "stable" - + description = "Arch Linux $pkgbase $epoch:$pkgver-$pkgrel" rpath = false +@@ -45,10 +44,10 @@ + [dist] + compression-formats = ["gz"] -[target.x86_64-unknown-linux-gnu] +[target.i686-unknown-linux-gnu] @@ -27,4 +34,6 @@ diff -rauN a/config.toml b/config.toml -[target.x86_64-unknown-linux-musl] +[target.i686-unknown-linux-musl] + sanitizers = false musl-root = "/usr/lib/musl" + |