| index : packages | |
| Archlinux32 package modifications | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | extra/rust/PKGBUILD | 25 |
diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index 7c29aeb9..7066b7eb 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -6,12 +6,12 @@ # see https://github.com/rust-lang/rust/issues/60294 source+=(config.toml.patch) -sha256sums+=('573b9869d71740aa5c7023670926600f5843d6e12480e3c9895caa37a4bc479c') +b2sums+=('b438042bad72f2952b135a46ca7353b0f333f58b7e5658e0f08fed75eba5095407aca479cbd6911fbaf2aa26482dce047293cf7114ace537b15acc8f10223551') eval "$( declare -f prepare | \ sed ' - $ i patch -p1 -i "$srcdir/config.toml.patch" + $ i patch -p0 -i "$srcdir/config.toml.patch" ' )" @@ -19,7 +19,7 @@ eval "$( eval "$( declare -f build | \ sed ' - s/-j "$(nproc)"/-j1/ + s/-j "$(nproc)"/$(grep -o -- "-j *[0-9]*" <<< ${MAKEFLAGS:--j8})/ ' )" @@ -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/87a043fd55d96d4bf471c7969df0912ccebdb1a5d52d157f4896af52f7af6d41/1c032d897011bc643fdb241251280d12c1b8cfd3ca3a31a8a2a107f8bf7dce13/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json" + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs" ' )" 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/ ' )" @@ -67,17 +68,19 @@ pkgname=( ) ) makedepends=(${makedepends[@]//lib32-gcc-libs/}) +makedepends=(${makedepends[@]//lib32-glibc/}) # Enable on demand, if your previous rust is broken use previous version # from build-support (this is preferable to using rust-bin below, but # requires all intermediate versions of rust to be built #makedepends=(${makedepends[@]//rust/}) -#makedepends+=('rust148') +#makedepends+=('rust162') # Enable on demand, if your previous rust is broken use previous version # from build-support #makedepends=(${makedepends[@]//rust/}) -#makedepends+=('rust-bin') +#makedepends+=('rust176-bin') + +# Do not run out of memory linking LLVM +options+=(!debug) -# rust 1.41 is built against llvm11.0, so force that in as a make dependency -makedepends+=('llvm11-libs') |