| index : packages | |
| Archlinux32 package modifications | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | extra/rust/PKGBUILD | 71 |
diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index 23c6bbaf..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+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660') +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,63 +27,60 @@ 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/spec/i686_unknown_linux_gnu.rs" - $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs" - $ i sed -i "s/a75a6025d7e3424edf9baf3039056c0f8eea157631a175d00ac5a218aa54b510/484bf8be15015b330fa9a97b6dabb8c7627e59d5cddb2dd0e83478749f8aabad/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 # Don't move lib32 support into rust32-lib, we are on 32-bit in the end # and don't draw a symlink to 64-bit libraries (but to 32-bit instead) - -pkgname=( - $( - printf '%s\n' "${pkgname[@]}" | \ - grep -v '^lib32-rust-libs' - ) -) +# move rust-musl though, also patch architecture for musl accordingly +eval "$( + declare -f build | \ + sed ' + /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/ + ' +)" eval "$( declare -f package_rust | \ sed ' - /mv.*i686-unknown-linux-gnu.*/d /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g ' )" eval "$( - declare -f build | \ + declare -f package_rust-musl | \ sed ' - /mv.*i686-unknown-linux-gnu.*/d - /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g + s/x86_64-unknown-linux-musl/i686-unknown-linux-musl/ ' )" -# work around P1024, U1024 typenum bug for old rust releases (bundled -# typenum version contains a buggy version) -if [ "${CARCH}" = "i686" ]; then - source+=('rustc-1.42.0-src-typenum-U1024.patch') - sha256sums+=('716e5fad9b8bda690856d36f33359da26a4c258bb5e8ffd635898697177dc4de') - eval "$( - declare -f prepare | \ - sed ' - /}/ i \ - patch -Np1 < "$srcdir/rustc-1.42.0-src-typenum-U1024.patch" - ' - )" +# remove 32-bit stuff (shouldn't that be removed automatically?) +pkgname=( + $( + printf '%s\n' "${pkgname[@]}" | \ + grep -v '^lib32-rust-libs' + ) +) +makedepends=(${makedepends[@]//lib32-gcc-libs/}) +makedepends=(${makedepends[@]//lib32-glibc/}) -fi +# 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+=('rust162') # Enable on demand, if your previous rust is broken use previous version # from build-support #makedepends=(${makedepends[@]//rust/}) -#makedepends+=('rust141') +#makedepends+=('rust176-bin') -# rust 1.41 is built against llvm 9.0, so force that in as a make dependency -#makedepends+=('llvm9-libs') +# Do not run out of memory linking LLVM +options+=(!debug) -# LLVM download location changed (also upstream) -source[2]="https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz" -source[3]="https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz.sig" -sha256sums[2]="6a7da64d3a0a7320577b68b9ca4933bdcab676e898b759850e827333c3282c75" |