index : packages | |
Archlinux32 package modifications | gitolite user |
summaryrefslogtreecommitdiff |
author | Andreas Baumann <mail@andreasbaumann.cc> | 2022-06-02 07:54:04 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2022-06-02 07:54:04 +0200 |
commit | 7227ad6abbf0ba9a67c385b1b5eb97acb746e245 (patch) | |
tree | 70fe660219bbfabbb4b38639265610a21ee74df1 /build-support/rust141 | |
parent | 295c4cf1791566c15efb2f864724ef42cc4100ea (diff) |
-rw-r--r-- | build-support/rust141/PKGBUILD | 218 | ||||
-rw-r--r-- | build-support/rust141/config.toml.patch | 26 | ||||
-rw-r--r-- | build-support/rust141/rustc-1.41.0-src-typenum-U1024.patch | 20 |
diff --git a/build-support/rust141/PKGBUILD b/build-support/rust141/PKGBUILD deleted file mode 100644 index afa6ad96..00000000 --- a/build-support/rust141/PKGBUILD +++ /dev/null @@ -1,218 +0,0 @@ -# Maintainer: Johannes Löthberg <johannes@kyriasis.com> -# Contributor: Alexander F Rødseth <xyproto@archlinux.org> -# Contributor: Daniel Micay <danielmicay@gmail.com> -# Contributor: userwithuid <userwithuid@gmail.com> - -pkgname=('rust141' 'rust141-docs') -epoch=1 -pkgver=1.41.0 -pkgrel=1 - -_llvm_ver=9.0.1 - -pkgdesc='Systems programming language focused on safety, speed and concurrency' -url='https://www.rust-lang.org/' -arch=(i486 i686 pentium4 'x86_64') -license=('MIT' 'Apache') - -makedepends=('rust140' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake') -checkdepends=('procps-ng' 'gdb') - -options=('!emptydirs') - -source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} - "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}) - -sha256sums=('5546822c09944c4d847968e9b7b3d0e299f143f307c00fa40e84a99fabf8d74b' - 'SKIP' - 'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077' - 'SKIP') -validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> - '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com> - 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org> - -prepare() { - cd "rustc-$pkgver-src" - - cat >config.toml <<END -[llvm] -link-shared = true - -[build] -target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] -cargo = "/usr/bin/cargo" -rustc = "/usr/bin/rustc" -python = "/usr/bin/python" -extended = true -sanitizers = false -profiler = true -vendor = true - -[install] -prefix = "/usr" - -[rust] -# LLVM crashes when passing an object through ThinLTO twice. This is triggered when using rust -# code in cross-language LTO if libstd was built using ThinLTO. -# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html -# https://github.com/rust-lang/rust/issues/54872 -codegen-units-std = 1 - -debuginfo-level = 2 - -channel = "stable" - -rpath = false - -[target.x86_64-unknown-linux-gnu] -llvm-config = "/usr/bin/llvm-config" -END -} - -build() { - cd "rustc-$pkgver-src" - - export RUST_BACKTRACE=1 - export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src" - - python ./x.py dist -j "$(nproc)" - DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)" - - # move docs and lib32 libs out of the way for splitting - mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686 - mv dest-rust/usr/share/doc dest-doc -} - -package_rust141() { - depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2') - optdepends=('lldb: rust-lldb script' - 'gdb: rust-gdb script') - provides=('cargo' 'rustfmt') - conflicts=('cargo' 'rustfmt') - replaces=('cargo' 'rustfmt') - - cd "rustc-$pkgver-src" - - mv dest-rust/* "$pkgdir" - install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* - - # delete unnecesary files, e.g. components and manifest files only used for the uninstall script - cd "$pkgdir"/usr/lib/rustlib - rm components install.log manifest-* rust-installer-version uninstall.sh - - # rustbuild always installs copies of the shared libraries to /usr/lib, - # overwrite them with symlinks to the per-architecture versions - ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so - - install -d "$pkgdir"/usr/share/bash-completion - mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/ -} - -package_lib32-rust-libs() { - descriptino=('32-bit libraries for Rust') - depends=('lib32-gcc-libs') - provides=('lib32-rust') - conflicts=('lib32-rust') - replaces=('lib32-rust') - - cd "rustc-$pkgver-src" - install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* - - install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/ - mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu - ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so -} - -package_rust141-docs() { - description=('Documentation for the Rust programming language') - - cd "rustc-$pkgver-src" - install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* - - install -d "$pkgdir"/usr/share/doc - mv dest-doc/* "$pkgdir"/usr/share/doc -} - -# vim:set ts=2 sw=2 et: -# enable i686-unknown-linux-gnu target -# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file -# -# Also trying to reduce memory usage by building with -# -debuginfo-level-std=1 -# see https://github.com/rust-lang/rust/issues/60294 - -source+=(config.toml.patch) -sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660') - -eval "$( - declare -f prepare | \ - sed ' - $ i patch -p1 -i "$srcdir/config.toml.patch" - ' -)" - -# stop insanity of nproc (see FS#62952) -eval "$( - declare -f build | \ - sed ' - s/-j"$(nproc)"/-j16/ - ' -)" - -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" - ' - )" -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' - ) -) - -eval "$( - declare -f package_rust141 | \ - sed ' - /mv.*i686-unknown-linux-gnu.*/d - /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g - ' -)" - -eval "$( - declare -f build | \ - sed ' - /mv.*i686-unknown-linux-gnu.*/d - /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g - ' -)" - -# work around P1024, U1024 typenum bug for old rust releases (bundled -# typenum version contains a buggy version) -if [ "${CARCH}" = "i686" ]; then - source+=('rustc-1.41.0-src-typenum-U1024.patch') - sha256sums+=('5e5ff622332c9f3fc00ef200d2d14de00e8973ea09a35cd42631ac46264a358a') - eval "$( - declare -f prepare | \ - sed ' - /}/ i \ - patch -Np1 < "$srcdir/rustc-1.41.0-src-typenum-U1024.patch" - ' - )" - -fi - -# Enable on demand, if your previous rust is broken, see also build-support and AUR -# for rust-bin. -#makedepends=(${makedepends[@]//rust/}) -#makedepends+=('rust-bin') -groups+=(build-shims) diff --git a/build-support/rust141/config.toml.patch b/build-support/rust141/config.toml.patch deleted file mode 100644 index 8d0762cd..00000000 --- a/build-support/rust141/config.toml.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -rauN a/config.toml b/config.toml ---- a/config.toml 2019-10-20 16:44:31.647900892 +0200 -+++ b/config.toml 2019-10-20 16:44:39.637875348 +0200 -@@ -2,7 +2,7 @@ - link-shared = true - - [build] --target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] -+target = ["i686-unknown-linux-gnu"] - cargo = "/usr/bin/cargo" - rustc = "/usr/bin/rustc" - python = "/usr/bin/python" -@@ -21,11 +21,11 @@ - # https://github.com/rust-lang/rust/issues/54872 - codegen-units-std = 1 - --debuginfo-level = 2 -+debuginfo-level = 0 - - channel = "stable" - - rpath = false - --[target.x86_64-unknown-linux-gnu] -+[target.i686-unknown-linux-gnu] - llvm-config = "/usr/bin/llvm-config" diff --git a/build-support/rust141/rustc-1.41.0-src-typenum-U1024.patch b/build-support/rust141/rustc-1.41.0-src-typenum-U1024.patch deleted file mode 100644 index d1484d5c..00000000 --- a/build-support/rust141/rustc-1.41.0-src-typenum-U1024.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rauN rustc-1.41.0-src/vendor/typenum/build/main.rs rustc-1.41.0-src-typenum-U1024-patch/vendor/typenum/build/main.rs ---- rustc-1.41.0-src/vendor/typenum/build/main.rs 2020-01-27 18:21:02.000000000 +0100 -+++ rustc-1.41.0-src-typenum-U1024-patch/vendor/typenum/build/main.rs 2020-04-19 10:51:35.744658747 +0200 -@@ -77,7 +77,7 @@ - fn main() { - let highest: u64 = 1024; - -- let first2: u32 = (highest as f64).log(2.0) as u32 + 1; -+ let first2: u32 = (highest as f64).log(2.0).round() as u32 + 1; - let first10: u32 = (highest as f64).log(10.0) as u32 + 1; - let uints = (0..(highest + 1)) - .chain((first2..64).map(|i| 2u64.pow(i))) -diff -rauN rustc-1.41.0-src/vendor/typenum/.cargo-checksum.json rustc-1.41.0-src-typenum-U1024-patch/vendor/typenum/.cargo-checksum.json ---- rustc-1.41.0-src/vendor/typenum/.cargo-checksum.json 2020-01-27 18:21:02.000000000 +0100 -+++ rustc-1.41.0-src-typenum-U1024-patch/vendor/typenum/.cargo-checksum.json 2020-04-19 11:26:01.513478655 +0200 -@@ -1 +1 @@ --{"files":{"CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"44d33ee79a76a90a769096547ba4c7a5d3822afffeed025dfbcc5bb755227d52","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"38a90c85068bb6bba1d21e9d5976e693b9b868ed0c16b26986332d2ca1c01047","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"} -\ No newline at end of file |