[arch-commits] Commit in rust/repos (5 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Mar 28 13:08:03 UTC 2019
Date: Thursday, March 28, 2019 @ 13:08:02
Author: foutrelis
Revision: 349350
archrelease: copy trunk to staging-x86_64
Added:
rust/repos/staging-x86_64/
rust/repos/staging-x86_64/0001-Backport-deprecation-fixes-from-commit-b7f030e.patch
(from rev 349349, rust/trunk/0001-Backport-deprecation-fixes-from-commit-b7f030e.patch)
rust/repos/staging-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch
(from rev 349349, rust/trunk/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch)
rust/repos/staging-x86_64/PKGBUILD
(from rev 349349, rust/trunk/PKGBUILD)
rust/repos/staging-x86_64/config.toml
(from rev 349349, rust/trunk/config.toml)
-----------------------------------------------------------------+
0001-Backport-deprecation-fixes-from-commit-b7f030e.patch | 57 ++++++
0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch | 30 +++
PKGBUILD | 83 ++++++++++
config.toml | 27 +++
4 files changed, 197 insertions(+)
Copied: rust/repos/staging-x86_64/0001-Backport-deprecation-fixes-from-commit-b7f030e.patch (from rev 349349, rust/trunk/0001-Backport-deprecation-fixes-from-commit-b7f030e.patch)
===================================================================
--- staging-x86_64/0001-Backport-deprecation-fixes-from-commit-b7f030e.patch (rev 0)
+++ staging-x86_64/0001-Backport-deprecation-fixes-from-commit-b7f030e.patch 2019-03-28 13:08:02 UTC (rev 349350)
@@ -0,0 +1,57 @@
+From 55030c7543d8e877ec7a6b577a51422c38f01259 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone at redhat.com>
+Date: Fri, 1 Mar 2019 09:27:45 -0800
+Subject: [PATCH] Backport deprecation fixes from commit b7f030e
+
+---
+ src/tools/linkchecker/main.rs | 6 +++---
+ src/tools/tidy/src/features.rs | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
+index 59662be349dc..2cf0fcfd34cd 100644
+--- a/src/tools/linkchecker/main.rs
++++ b/src/tools/linkchecker/main.rs
+@@ -78,7 +78,7 @@ impl FileEntry {
+ fn parse_ids(&mut self, file: &Path, contents: &str, errors: &mut bool) {
+ if self.ids.is_empty() {
+ with_attrs_in_source(contents, " id", |fragment, i, _| {
+- let frag = fragment.trim_left_matches("#").to_owned();
++ let frag = fragment.trim_start_matches("#").to_owned();
+ let encoded = small_url_encode(&frag);
+ if !self.ids.insert(frag) {
+ *errors = true;
+@@ -343,7 +343,7 @@ fn with_attrs_in_source<F: FnMut(&str, usize, &str)>(contents: &str, attr: &str,
+ Some(i) => i,
+ None => continue,
+ };
+- if rest[..pos_equals].trim_left_matches(" ") != "" {
++ if rest[..pos_equals].trim_start_matches(" ") != "" {
+ continue;
+ }
+
+@@ -355,7 +355,7 @@ fn with_attrs_in_source<F: FnMut(&str, usize, &str)>(contents: &str, attr: &str,
+ };
+ let quote_delim = rest.as_bytes()[pos_quote] as char;
+
+- if rest[..pos_quote].trim_left_matches(" ") != "" {
++ if rest[..pos_quote].trim_start_matches(" ") != "" {
+ continue;
+ }
+ let rest = &rest[pos_quote + 1..];
+diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
+index 2435a0cfd4e3..bf2cfbf32fc7 100644
+--- a/src/tools/tidy/src/features.rs
++++ b/src/tools/tidy/src/features.rs
+@@ -188,7 +188,7 @@ pub fn collect_lang_features(base_src_path: &Path, bad: &mut bool) -> Features {
+ }
+
+ let mut parts = line.split(',');
+- let level = match parts.next().map(|l| l.trim().trim_left_matches('(')) {
++ let level = match parts.next().map(|l| l.trim().trim_start_matches('(')) {
+ Some("active") => Status::Unstable,
+ Some("removed") => Status::Removed,
+ Some("accepted") => Status::Stable,
+--
+2.20.1
+
Copied: rust/repos/staging-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch (from rev 349349, rust/trunk/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch)
===================================================================
--- staging-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch (rev 0)
+++ staging-x86_64/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch 2019-03-28 13:08:02 UTC (rev 349350)
@@ -0,0 +1,30 @@
+From c5f42fa1207dc6df476b55a9cdda439d8cfcba05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at 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 <johannes at 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
+
Copied: rust/repos/staging-x86_64/PKGBUILD (from rev 349349, rust/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-03-28 13:08:02 UTC (rev 349350)
@@ -0,0 +1,83 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: userwithuid <userwithuid at gmail.com>
+
+# Remember to bump lib32-rust as well!
+
+pkgname=('rust' 'rust-docs')
+epoch=1
+pkgver=1.33.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' 'llvm7' '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-Backport-deprecation-fixes-from-commit-b7f030e.patch
+ 0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch)
+
+sha256sums=('5a01a8d7e65126f6079042831385e77485fa5c014bf217e9f3e4aff36a485d94'
+ 'SKIP'
+ 'ce1c2648e70a14362d33d0cbbd3e35846ea9d43a8d0abc36071563fc087b82d5'
+ 'd2fdd8ec0196e87b930f49a9ffa9fe7fe4995af54cfa8ee5638c7dc2170f5f8c'
+ 'cf04a3c8ac0b4f5d786532e6e07a2f52cea2216d899be8d7c0b087aab78a2b68')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
+
+prepare() {
+ cd "rustc-$pkgver-src"
+
+ cp "$srcdir"/config.toml config.toml
+ patch -p1 <"$srcdir"/0001-Backport-deprecation-fixes-from-commit-b7f030e.patch
+ patch -p1 <"$srcdir"/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch
+}
+
+build() {
+ cd "rustc-$pkgver-src"
+
+ python2 ./x.py build -j"$(nproc)"
+}
+
+package_rust() {
+ depends=('gcc-libs' 'llvm7-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/staging-x86_64/config.toml (from rev 349349, rust/trunk/config.toml)
===================================================================
--- staging-x86_64/config.toml (rev 0)
+++ staging-x86_64/config.toml 2019-03-28 13:08:02 UTC (rev 349350)
@@ -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"
More information about the arch-commits
mailing list