[arch-commits] Commit in rust/repos/community-x86_64 (6 files)
Johannes Löthberg
demize at archlinux.org
Mon Mar 5 14:39:27 UTC 2018
Date: Monday, March 5, 2018 @ 14:39:25
Author: demize
Revision: 302757
archrelease: copy trunk to community-x86_64
Added:
rust/repos/community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch
(from rev 302756, rust/trunk/0001-librustc_llvm-build-Force-link-against-libffi.patch)
rust/repos/community-x86_64/PKGBUILD
(from rev 302756, rust/trunk/PKGBUILD)
rust/repos/community-x86_64/bootstrap-config.toml
(from rev 302756, rust/trunk/bootstrap-config.toml)
Deleted:
rust/repos/community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch
rust/repos/community-x86_64/PKGBUILD
rust/repos/community-x86_64/bootstrap-config.toml
----------------------------------------------------------+
0001-librustc_llvm-build-Force-link-against-libffi.patch | 64 ++---
PKGBUILD | 153 ++++++-------
bootstrap-config.toml | 44 +--
3 files changed, 129 insertions(+), 132 deletions(-)
Deleted: 0001-librustc_llvm-build-Force-link-against-libffi.patch
===================================================================
--- 0001-librustc_llvm-build-Force-link-against-libffi.patch 2018-03-05 14:39:14 UTC (rev 302756)
+++ 0001-librustc_llvm-build-Force-link-against-libffi.patch 2018-03-05 14:39:25 UTC (rev 302757)
@@ -1,32 +0,0 @@
-From 5dbc650a60ddb230f59e5a18ffd298b033566945 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
-Date: Thu, 20 Jul 2017 23:07:01 +0200
-Subject: [PATCH] librustc_llvm/build: Force link against libffi
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-`llvm-config --libs` doesn't output libffi in many cases. Fixing it
-turned out to take quite a bit of effort, so force libffi linking in
-here for now.
-
-Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
----
- src/librustc_llvm/build.rs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
-index 3f0f536960..7dc0c40c9d 100644
---- a/src/librustc_llvm/build.rs
-+++ b/src/librustc_llvm/build.rs
-@@ -220,6 +220,7 @@ fn main() {
- };
- println!("cargo:rustc-link-lib={}={}", kind, name);
- }
-+ println!("cargo:rustc-link-lib=dylib=ffi");
-
- // LLVM ldflags
- //
---
-2.13.3
-
Copied: rust/repos/community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch (from rev 302756, rust/trunk/0001-librustc_llvm-build-Force-link-against-libffi.patch)
===================================================================
--- 0001-librustc_llvm-build-Force-link-against-libffi.patch (rev 0)
+++ 0001-librustc_llvm-build-Force-link-against-libffi.patch 2018-03-05 14:39:25 UTC (rev 302757)
@@ -0,0 +1,32 @@
+From 5dbc650a60ddb230f59e5a18ffd298b033566945 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
+Date: Thu, 20 Jul 2017 23:07:01 +0200
+Subject: [PATCH] librustc_llvm/build: Force link against libffi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+`llvm-config --libs` doesn't output libffi in many cases. Fixing it
+turned out to take quite a bit of effort, so force libffi linking in
+here for now.
+
+Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
+---
+ src/librustc_llvm/build.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
+index 3f0f536960..7dc0c40c9d 100644
+--- a/src/librustc_llvm/build.rs
++++ b/src/librustc_llvm/build.rs
+@@ -220,6 +220,7 @@ fn main() {
+ };
+ println!("cargo:rustc-link-lib={}={}", kind, name);
+ }
++ println!("cargo:rustc-link-lib=dylib=ffi");
+
+ // LLVM ldflags
+ //
+--
+2.13.3
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-05 14:39:14 UTC (rev 302756)
+++ PKGBUILD 2018-03-05 14:39:25 UTC (rev 302757)
@@ -1,78 +0,0 @@
-# $Id$
-# 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>
-
-pkgname=('rust' 'rust-docs')
-epoch=1
-pkgver=1.24.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' 'libffi' 'perl' 'python2' 'curl' 'cmake')
-
-options=('!emptydirs')
-
-source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
- bootstrap-config.toml)
-
-sha256sums=('bb8276f6044e877e447f29f566e4bbf820fa51fea2f912d59b73233ffd95639f'
- 'SKIP'
- '8e30fcd8633e1900056ecbcc7267fea23e8e08889460239c614d4dcd796ce4f3')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
-
-prepare() {
- cd "rustc-$pkgver-src"
-
- cp "$srcdir"/bootstrap-config.toml config.toml
-}
-
-build() {
- cd "rustc-$pkgver-src"
-
- msg2 "Run build under x.py"
- python2 ./x.py build
-}
-
-package_rust() {
- depends=('gcc-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
- mv "$pkgdir/usr/share/doc" "$srcdir/"
-
- # The version distributed with rust is old and buggy, and ends up breaking other builds.
- rm "$pkgdir"/usr/bin/rustfmt
-}
-
-package_rust-docs() {
- msg2 "Packaging documentation"
- 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/community-x86_64/PKGBUILD (from rev 302756, rust/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-03-05 14:39:25 UTC (rev 302757)
@@ -0,0 +1,75 @@
+# $Id$
+# 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>
+
+pkgname=('rust' 'rust-docs')
+epoch=1
+pkgver=1.24.1
+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' 'libffi' 'perl' 'python2' 'curl' 'cmake')
+
+options=('!emptydirs')
+
+source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+ bootstrap-config.toml)
+
+sha256sums=('3ea53d45e8d2e9a41afb3340cf54b9745f845b552d802d607707cf04450761ef'
+ 'SKIP'
+ '8e30fcd8633e1900056ecbcc7267fea23e8e08889460239c614d4dcd796ce4f3')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
+
+prepare() {
+ cd "rustc-$pkgver-src"
+
+ cp "$srcdir"/bootstrap-config.toml config.toml
+}
+
+build() {
+ cd "rustc-$pkgver-src"
+
+ msg2 "Run build under x.py"
+ python2 ./x.py build
+}
+
+package_rust() {
+ depends=('gcc-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
+ mv "$pkgdir/usr/share/doc" "$srcdir/"
+}
+
+package_rust-docs() {
+ msg2 "Packaging documentation"
+ 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: bootstrap-config.toml
===================================================================
--- bootstrap-config.toml 2018-03-05 14:39:14 UTC (rev 302756)
+++ bootstrap-config.toml 2018-03-05 14:39:25 UTC (rev 302757)
@@ -1,22 +0,0 @@
-[build]
-cargo = "/usr/bin/cargo"
-rustc = "/usr/bin/rustc"
-python = "python2.7"
-extended = true
-# Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
-verbose = 0
-# Build the sanitizer runtimes
-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"
Copied: rust/repos/community-x86_64/bootstrap-config.toml (from rev 302756, rust/trunk/bootstrap-config.toml)
===================================================================
--- bootstrap-config.toml (rev 0)
+++ bootstrap-config.toml 2018-03-05 14:39:25 UTC (rev 302757)
@@ -0,0 +1,22 @@
+[build]
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
+python = "python2.7"
+extended = true
+# Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
+verbose = 0
+# Build the sanitizer runtimes
+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"
More information about the arch-commits
mailing list