index : packages | |
Archlinux32 package modifications | gitolite user |
summaryrefslogtreecommitdiff |
-rw-r--r-- | extra/rust/PKGBUILD | 57 | ||||
-rw-r--r-- | extra/rust/config.toml.patch | 43 |
diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index c523b1f3..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+=('0430e94e8f8c6b4c8154b236dc132fc182e8efd28ce5e7685692cef55e408515') +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,43 +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/7dd6e3219a9d324f6f44dc230261df116995de5a02d0d12770490eb3e7b4df75/21c1ae9e514c828baae1b8b723d06515eb60289d02f390e6a38c2c9d6fc3bde0/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/ ' )" +# 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/}) + +# 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+=('rust-bin') +#makedepends+=('rust176-bin') + +# Do not run out of memory linking LLVM +options+=(!debug) -# rust 1.41 is built against llvm 9.0, so force that in as a make dependency -#makedepends+=('llvm9-libs') diff --git a/extra/rust/config.toml.patch b/extra/rust/config.toml.patch index 0f0cfc22..c002cff6 100644 --- a/extra/rust/config.toml.patch +++ b/extra/rust/config.toml.patch @@ -1,26 +1,31 @@ -diff -rauN a/config.toml b/config.toml ---- a/config.toml 2020-08-01 10:50:30.352304826 +0200 -+++ b/config.toml 2020-08-01 10:51:38.355820332 +0200 -@@ -2,7 +2,7 @@ - link-shared = true +--- config.toml.orig 2024-05-06 00:02:38.463811257 +0000 ++++ config.toml 2024-05-06 00:57:21.364799544 +0000 +@@ -6,9 +6,8 @@ [build] --target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] -+target = ["i686-unknown-linux-gnu"] - tools = ["cargo", "rls", "clippy", "miri", "rustfmt", "analysis", "src"] - cargo = "/usr/bin/cargo" - rustc = "/usr/bin/rustc" -@@ -22,11 +22,11 @@ - # https://github.com/rust-lang/rust/issues/54872 + target = [ +- "x86_64-unknown-linux-gnu", + "i686-unknown-linux-gnu", +- "x86_64-unknown-linux-musl", ++ "i686-unknown-linux-musl", + "wasm32-unknown-unknown", + "wasm32-wasi", + ] +@@ -39,7 +38,7 @@ + [rust] codegen-units-std = 1 - + debuginfo-level = 1 -debuginfo-level-std = 2 -+debuginfo-level-std = 0 - ++debuginfo-level-std = 1 channel = "stable" - + description = "Arch Linux :-" rpath = false +@@ -65,7 +64,7 @@ + ar = "/usr/bin/gcc-ar" + ranlib = "/usr/bin/gcc-ranlib" + +-[target.x86_64-unknown-linux-musl] ++[target.i686-unknown-linux-musl] + sanitizers = false + musl-root = "/usr/lib/musl" --[target.x86_64-unknown-linux-gnu] -+[target.i686-unknown-linux-gnu] - llvm-config = "/usr/bin/llvm-config" |