Date: Tuesday, August 20, 2019 @ 04:32:33
Author: heftig
Revision: 359971
archrelease: copy trunk to extra-x86_64
Added:
rust/repos/extra-x86_64/PKGBUILD
(from rev 359970, rust/trunk/PKGBUILD)
rust/repos/extra-x86_64/config.toml
(from rev 359970, rust/trunk/config.toml)
Deleted:
rust/repos/extra-x86_64/PKGBUILD
rust/repos/extra-x86_64/config.toml
-------------+
PKGBUILD | 161 ++++++++++++++++++++++++++++++----------------------------
config.toml | 55 ++++++++++---------
2 files changed, 114 insertions(+), 102 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-20 04:30:23 UTC (rev 359970)
+++ PKGBUILD 2019-08-20 04:32:33 UTC (rev 359971)
@@ -1,76 +0,0 @@
-# Maintainer: Johannes Löthberg <johan...@kyriasis.com>
-# Contributor: Alexander F Rødseth <xypr...@archlinux.org>
-# Contributor: Daniel Micay <danielmi...@gmail.com>
-# Contributor: userwithuid <userwith...@gmail.com>
-
-# Remember to bump lib32-rust as well!
-
-pkgname=('rust' 'rust-docs')
-epoch=1
-pkgver=1.37.0
-pkgrel=1
-
-pkgdesc='Systems programming language focused on safety, speed and concurrency'
-url='https://www.rust-lang.org/'
-arch=('x86_64')
-license=('MIT' 'Apache')
-
-makedepends=('rust' 'llvm' 'libffi' 'perl' 'python' 'curl' 'cmake')
-checkdepends=('procps-ng' 'gdb')
-
-options=('!emptydirs')
-
-source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
- config.toml)
-
-sha256sums=('120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3'
- 'SKIP'
- '24a5fbf558c7ffb39b3e712f26e0261a2e1f35d2caff17981e828c36bb5c746a')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag
and Release Signing Key) <rust-...@rust-lang.org>
-
-prepare() {
- cd "rustc-$pkgver-src"
-
- cp "$srcdir"/config.toml config.toml
-}
-
-build() {
- cd "rustc-$pkgver-src"
-
- python ./x.py build -j"$(nproc)"
-}
-
-package_rust() {
- depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
- provides=('cargo' 'rustfmt')
- conflicts=('cargo' 'rustfmt')
- replaces=('cargo' 'rustfmt')
-
- cd "rustc-$pkgver-src"
-
- DESTDIR="$pkgdir" python ./x.py install
-
- for license in APACHE MIT; do install -Dm644 "LICENSE-$license" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done
-
- cd "$pkgdir/usr/lib"
-
- rm rustlib/{components,manifest-rustc,rust-installer-version}
- ln -sf rustlib/$CARCH-unknown-linux-gnu/lib/*.so .
-
- # move docs out of the way for splitting
- mv "$pkgdir"/usr/share/doc "$srcdir"
-
- install -d "$pkgdir"/usr/share/bash-completion
- mv "$pkgdir"/etc/bash_completion.d/
"$pkgdir"/usr/share/bash-completion/completions/
-}
-
-package_rust-docs() {
- install -d "$pkgdir/usr/share/doc/"
- mv "$srcdir"/doc/* "$pkgdir"/usr/share/doc/rust/
-
- for license in APACHE MIT; do install -Dm644
"rustc-$pkgver-src/LICENSE-$license" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: rust/repos/extra-x86_64/PKGBUILD (from rev 359970, rust/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-08-20 04:32:33 UTC (rev 359971)
@@ -0,0 +1,85 @@
+# Maintainer: Johannes Löthberg <johan...@kyriasis.com>
+# Contributor: Alexander F Rødseth <xypr...@archlinux.org>
+# Contributor: Daniel Micay <danielmi...@gmail.com>
+# Contributor: userwithuid <userwith...@gmail.com>
+
+# Remember to bump lib32-rust as well!
+
+pkgname=('rust' 'rust-docs')
+epoch=1
+pkgver=1.37.0
+pkgrel=2
+
+_llvm_ver=8.0.1
+
+pkgdesc='Systems programming language focused on safety, speed and concurrency'
+url='https://www.rust-lang.org/'
+arch=('x86_64')
+license=('MIT' 'Apache')
+
+makedepends=('rust' "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}
+ config.toml)
+
+sha256sums=('120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3'
+ 'SKIP'
+ '11828fb4823387d820c6715b25f6b2405e60837d12a7469e7a8882911c721837'
+ 'SKIP'
+ '07affeba0bf6a50ebfcc471111b436cccfa01990802ad8fe567d1f3c9922a8fe')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag
and Release Signing Key) <rust-...@rust-lang.org>
+ '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard
<tstel...@redhat.com>
+
+prepare() {
+ cd "rustc-$pkgver-src"
+
+ cp "$srcdir"/config.toml config.toml
+}
+
+build() {
+ cd "rustc-$pkgver-src"
+
+ export RUST_BACKTRACE=1
+ export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
+
+ python ./x.py build -j"$(nproc)"
+}
+
+package_rust() {
+ depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
+ provides=('cargo' 'rustfmt')
+ conflicts=('cargo' 'rustfmt')
+ replaces=('cargo' 'rustfmt')
+
+ cd "rustc-$pkgver-src"
+
+ DESTDIR="$pkgdir" python ./x.py install
+
+ for license in APACHE MIT; do install -Dm644 "LICENSE-$license" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done
+
+ cd "$pkgdir/usr/lib"
+
+ rm rustlib/{components,manifest-rustc,rust-installer-version}
+ ln -sf rustlib/$CARCH-unknown-linux-gnu/lib/*.so .
+
+ # move docs out of the way for splitting
+ mv "$pkgdir"/usr/share/doc "$srcdir"
+
+ install -d "$pkgdir"/usr/share/bash-completion
+ mv "$pkgdir"/etc/bash_completion.d/
"$pkgdir"/usr/share/bash-completion/completions/
+}
+
+package_rust-docs() {
+ install -d "$pkgdir/usr/share/doc/"
+ mv "$srcdir"/doc/* "$pkgdir"/usr/share/doc/rust/
+
+ for license in APACHE MIT; do install -Dm644
"rustc-$pkgver-src/LICENSE-$license" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: config.toml
===================================================================
--- config.toml 2019-08-20 04:30:23 UTC (rev 359970)
+++ config.toml 2019-08-20 04:32:33 UTC (rev 359971)
@@ -1,26 +0,0 @@
-[llvm]
-link-shared = true
-
-[build]
-cargo = "/usr/bin/cargo"
-rustc = "/usr/bin/rustc"
-python = "python"
-extended = true
-sanitizers = false
-
-[install]
-prefix = "/usr"
-
-[rust]
-# 0 or the new default of 16 is faster, but can result in worse performance
-# https://github.com/rust-lang/rust/issues/47745
-codegen-units = 1
-
-debuginfo-level = 2
-
-channel = "stable"
-
-rpath = false
-
-[target.x86_64-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
Copied: rust/repos/extra-x86_64/config.toml (from rev 359970,
rust/trunk/config.toml)
===================================================================
--- config.toml (rev 0)
+++ config.toml 2019-08-20 04:32:33 UTC (rev 359971)
@@ -0,0 +1,29 @@
+[llvm]
+link-shared = true
+
+[build]
+target = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
+python = "python"
+extended = true
+sanitizers = false
+profiler = true
+local-rebuild = false
+
+[install]
+prefix = "/usr"
+
+[rust]
+# 0 or the new default of 16 is faster, but can result in worse performance
+# https://github.com/rust-lang/rust/issues/47745
+codegen-units = 1
+
+debuginfo-level = 2
+
+channel = "stable"
+
+rpath = false
+
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"
