Date: Saturday, September 28, 2019 @ 13:55:49 Author: demize Revision: 363505
Merge lib32-rust into being split from the rust package Modified: rust/trunk/PKGBUILD rust/trunk/config.toml -------------+ PKGBUILD | 24 +++++++++++++++++++----- config.toml | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-28 13:55:04 UTC (rev 363504) +++ PKGBUILD 2019-09-28 13:55:49 UTC (rev 363505) @@ -3,9 +3,7 @@ # Contributor: Daniel Micay <[email protected]> # Contributor: userwithuid <[email protected]> -# Remember to bump lib32-rust as well! - -pkgname=('rust' 'rust-docs') +pkgname=('rust' 'lib32-rust-libs' 'rust-docs') epoch=1 pkgver=1.37.0 pkgrel=2 @@ -17,7 +15,7 @@ arch=('x86_64') license=('MIT' 'Apache') -makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake') +makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'lib32-gcc-libs' 'perl' 'python' 'curl' 'cmake') checkdepends=('procps-ng' 'gdb') options=('!emptydirs') @@ -30,7 +28,7 @@ 'SKIP' '11828fb4823387d820c6715b25f6b2405e60837d12a7469e7a8882911c721837' 'SKIP' - '07affeba0bf6a50ebfcc471111b436cccfa01990802ad8fe567d1f3c9922a8fe') + 'f3872bf7ae28eeee18a14daa9abaf4ea728820a6c673ad86c809de894f3ff2b9') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <[email protected]> '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <[email protected]> @@ -74,6 +72,22 @@ 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') + + install -d "$pkgdir"/usr/lib/rustlib/ + mv "$srcdir"/i686-unknown-linux-gnu "$pkgdir"/usr/lib/rustlib + + cd "rustc-$pkgver-src" + for license in APACHE MIT; do + install -Dm644 "LICENSE-$license" "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license" + done +} + package_rust-docs() { install -d "$pkgdir/usr/share/doc/" mv "$srcdir"/doc/* "$pkgdir"/usr/share/doc/rust/ Modified: config.toml =================================================================== --- config.toml 2019-09-28 13:55:04 UTC (rev 363504) +++ config.toml 2019-09-28 13:55:49 UTC (rev 363505) @@ -2,7 +2,7 @@ link-shared = true [build] -target = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple +target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] cargo = "/usr/bin/cargo" rustc = "/usr/bin/rustc" python = "python"
