Date: Sunday, March 17, 2019 @ 13:22:10 Author: demize Revision: 348569
db-move: moved rust from [testing] to [extra] (x86_64) Added: rust/repos/extra-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch (from rev 348568, rust/repos/testing-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch) rust/repos/extra-x86_64/PKGBUILD (from rev 348568, rust/repos/testing-x86_64/PKGBUILD) rust/repos/extra-x86_64/config.toml (from rev 348568, rust/repos/testing-x86_64/config.toml) Deleted: rust/repos/extra-x86_64/PKGBUILD rust/repos/extra-x86_64/config.toml rust/repos/testing-x86_64/ ------------------------------------------------------------------------------+ /PKGBUILD | 80 ++++++++++ /config.toml | 27 +++ extra-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch | 30 +++ extra-x86_64/PKGBUILD | 77 --------- extra-x86_64/config.toml | 27 --- 5 files changed, 137 insertions(+), 104 deletions(-) Copied: rust/repos/extra-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch (from rev 348568, rust/repos/testing-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch) =================================================================== --- extra-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch (rev 0) +++ extra-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch 2019-03-17 13:22:10 UTC (rev 348569) @@ -0,0 +1,30 @@ +From c5f42fa1207dc6df476b55a9cdda439d8cfcba05 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@kyriasis.com> +Date: Thu, 14 Mar 2019 20:35:52 +0100 +Subject: [PATCH] Revert 1c95f5a34c14f08d65cdd198827e3a2fcb63cf39 + + 9452a8dfa3ba3575d5cf090a4e2305ee106d259e +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Johannes Löthberg <johan...@kyriasis.com> +--- + src/librustc_codegen_llvm/debuginfo/metadata.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs +index 9f63038c36..553b952b56 100644 +--- a/src/librustc_codegen_llvm/debuginfo/metadata.rs ++++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs +@@ -1167,7 +1167,7 @@ fn use_enum_fallback(cx: &CodegenCx) -> bool { + // LLVM version 7 did not release with an important bug fix; + // but the required patch is in the LLVM 8. Rust LLVM reports + // 8 as well. +- || llvm_util::get_major_version() < 8; ++ || llvm_util::get_major_version() < 7; + } + + // Describes the members of an enum value: An enum is described as a union of +-- +2.20.1 + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2019-03-17 13:15:56 UTC (rev 348568) +++ extra-x86_64/PKGBUILD 2019-03-17 13:22:10 UTC (rev 348569) @@ -1,77 +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.32.0 -pkgrel=2 - -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' 'python2' 'curl' 'cmake') -checkdepends=('procps-ng' 'gdb') - -options=('!emptydirs') - -source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} - config.toml) - -sha256sums=('4c594c7712a0e7e8eae6526c464bf6ea1d82f77b4f61717c3fc28fb27ba2224a' - 'SKIP' - 'ce1c2648e70a14362d33d0cbbd3e35846ea9d43a8d0abc36071563fc087b82d5') -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" - - python2 ./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" python2 ./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/ - - msg2 "Packaging license files for the documentation" - 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 348568, rust/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2019-03-17 13:22:10 UTC (rev 348569) @@ -0,0 +1,80 @@ +# 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.33.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' 'python2' 'curl' 'cmake') +checkdepends=('procps-ng' 'gdb') + +options=('!emptydirs') + +source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} + config.toml + 0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch) + +sha256sums=('5a01a8d7e65126f6079042831385e77485fa5c014bf217e9f3e4aff36a485d94' + 'SKIP' + 'ce1c2648e70a14362d33d0cbbd3e35846ea9d43a8d0abc36071563fc087b82d5' + 'cf04a3c8ac0b4f5d786532e6e07a2f52cea2216d899be8d7c0b087aab78a2b68') +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-...@rust-lang.org> + +prepare() { + cd "rustc-$pkgver-src" + + cp "$srcdir"/config.toml config.toml + patch -p1 <"$srcdir"/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch +} + +build() { + cd "rustc-$pkgver-src" + + python2 ./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" python2 ./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/ + + msg2 "Packaging license files for the documentation" + 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: extra-x86_64/config.toml =================================================================== --- extra-x86_64/config.toml 2019-03-17 13:15:56 UTC (rev 348568) +++ extra-x86_64/config.toml 2019-03-17 13:22:10 UTC (rev 348569) @@ -1,27 +0,0 @@ -[llvm] -link-shared = true - -[build] -cargo = "/usr/bin/cargo" -rustc = "/usr/bin/rustc" -python = "python2.7" -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 = true -debuginfo-lines = true - -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 348568, rust/repos/testing-x86_64/config.toml) =================================================================== --- extra-x86_64/config.toml (rev 0) +++ extra-x86_64/config.toml 2019-03-17 13:22:10 UTC (rev 348569) @@ -0,0 +1,27 @@ +[llvm] +link-shared = true + +[build] +cargo = "/usr/bin/cargo" +rustc = "/usr/bin/rustc" +python = "python2.7" +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 = true +debuginfo-lines = true + +channel = "stable" + +rpath = false + +[target.x86_64-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config"