[arch-commits] Commit in rust/repos (8 files)

Johannes Löthberg demize at archlinux.org
Tue Aug 1 18:14:41 UTC 2017


    Date: Tuesday, August 1, 2017 @ 18:14:40
  Author: demize
Revision: 247369

archrelease: copy trunk to community-x86_64, community-i686

Added:
  rust/repos/community-i686/0001-librustc_llvm-build-Force-link-against-libffi.patch
    (from rev 247368, rust/trunk/0001-librustc_llvm-build-Force-link-against-libffi.patch)
  rust/repos/community-i686/PKGBUILD
    (from rev 247368, rust/trunk/PKGBUILD)
  rust/repos/community-i686/bootstrap-config.toml
    (from rev 247368, rust/trunk/bootstrap-config.toml)
  rust/repos/community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch
    (from rev 247368, rust/trunk/0001-librustc_llvm-build-Force-link-against-libffi.patch)
  rust/repos/community-x86_64/PKGBUILD
    (from rev 247368, rust/trunk/PKGBUILD)
  rust/repos/community-x86_64/bootstrap-config.toml
    (from rev 247368, rust/trunk/bootstrap-config.toml)
Deleted:
  rust/repos/community-i686/PKGBUILD
  rust/repos/community-x86_64/PKGBUILD

---------------------------------------------------------------------------+
 /PKGBUILD                                                                 |  156 ++++++++++
 community-i686/0001-librustc_llvm-build-Force-link-against-libffi.patch   |   32 ++
 community-i686/PKGBUILD                                                   |   78 -----
 community-i686/bootstrap-config.toml                                      |   27 +
 community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch |   32 ++
 community-x86_64/PKGBUILD                                                 |   78 -----
 community-x86_64/bootstrap-config.toml                                    |   27 +
 7 files changed, 274 insertions(+), 156 deletions(-)

Copied: rust/repos/community-i686/0001-librustc_llvm-build-Force-link-against-libffi.patch (from rev 247368, rust/trunk/0001-librustc_llvm-build-Force-link-against-libffi.patch)
===================================================================
--- community-i686/0001-librustc_llvm-build-Force-link-against-libffi.patch	                        (rev 0)
+++ community-i686/0001-librustc_llvm-build-Force-link-against-libffi.patch	2017-08-01 18:14:40 UTC (rev 247369)
@@ -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: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-08-01 18:13:17 UTC (rev 247368)
+++ community-i686/PKGBUILD	2017-08-01 18:14:40 UTC (rev 247369)
@@ -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.19.0
-pkgrel=2
-
-pkgdesc='Systems programming language focused on safety, speed and concurrency'
-url='https://www.rust-lang.org/'
-arch=('x86_64' 'i686')
-license=('MIT' 'Apache')
-
-makedepends=('rust' 'cargo' 'libffi' 'perl' 'python2' 'curl' 'llvm' 'cmake')
-
-options=('!emptydirs')
-
-provides=('cargo')
-conflicts=('cargo')
-replaces=('cargo')
-
-source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
-        0001-librustc_llvm-build-Force-link-against-libffi.patch
-        bootstrap-config.toml)
-
-sha256sums=('15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51'
-            'SKIP'
-            '563529da8e02f575ddde7247d5fc5350d74031daa54743b86d075f3c45ae2713'
-            '4252d4873a840216115ee306e4d689819bc791ee05bedd1faa0b00c49ff91c62')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
-
-prepare() {
-  cd "rustc-$pkgver-src"
-
-  patch -p1 <"$srcdir"/0001-librustc_llvm-build-Force-link-against-libffi.patch
-  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' 'llvm-libs')
-
-  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:

Copied: rust/repos/community-i686/PKGBUILD (from rev 247368, rust/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-08-01 18:14:40 UTC (rev 247369)
@@ -0,0 +1,78 @@
+# $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.19.0
+pkgrel=3
+
+pkgdesc='Systems programming language focused on safety, speed and concurrency'
+url='https://www.rust-lang.org/'
+arch=('x86_64' 'i686')
+license=('MIT' 'Apache')
+
+makedepends=('rust' 'cargo' 'libffi' 'perl' 'python2' 'curl' 'llvm' 'cmake')
+
+options=('!emptydirs')
+
+source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+        0001-librustc_llvm-build-Force-link-against-libffi.patch
+        bootstrap-config.toml)
+
+sha256sums=('15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51'
+            'SKIP'
+            '563529da8e02f575ddde7247d5fc5350d74031daa54743b86d075f3c45ae2713'
+            '4252d4873a840216115ee306e4d689819bc791ee05bedd1faa0b00c49ff91c62')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
+
+prepare() {
+  cd "rustc-$pkgver-src"
+
+  patch -p1 <"$srcdir"/0001-librustc_llvm-build-Force-link-against-libffi.patch
+  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' 'llvm-libs')
+  provides=('cargo')
+  conflicts=('cargo')
+  replaces=('cargo')
+
+
+  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:

Copied: rust/repos/community-i686/bootstrap-config.toml (from rev 247368, rust/trunk/bootstrap-config.toml)
===================================================================
--- community-i686/bootstrap-config.toml	                        (rev 0)
+++ community-i686/bootstrap-config.toml	2017-08-01 18:14:40 UTC (rev 247369)
@@ -0,0 +1,27 @@
+[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]
+codegen-units = 0
+debuginfo = true
+
+# Whether or not line number debug information is emitted
+#debuginfo-lines = false
+
+channel = "stable"
+
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"
+
+[target.i686-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"

Copied: rust/repos/community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch (from rev 247368, rust/trunk/0001-librustc_llvm-build-Force-link-against-libffi.patch)
===================================================================
--- community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch	                        (rev 0)
+++ community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch	2017-08-01 18:14:40 UTC (rev 247369)
@@ -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: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-08-01 18:13:17 UTC (rev 247368)
+++ community-x86_64/PKGBUILD	2017-08-01 18:14:40 UTC (rev 247369)
@@ -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.19.0
-pkgrel=2
-
-pkgdesc='Systems programming language focused on safety, speed and concurrency'
-url='https://www.rust-lang.org/'
-arch=('x86_64' 'i686')
-license=('MIT' 'Apache')
-
-makedepends=('rust' 'cargo' 'libffi' 'perl' 'python2' 'curl' 'llvm' 'cmake')
-
-options=('!emptydirs')
-
-provides=('cargo')
-conflicts=('cargo')
-replaces=('cargo')
-
-source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
-        0001-librustc_llvm-build-Force-link-against-libffi.patch
-        bootstrap-config.toml)
-
-sha256sums=('15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51'
-            'SKIP'
-            '563529da8e02f575ddde7247d5fc5350d74031daa54743b86d075f3c45ae2713'
-            '4252d4873a840216115ee306e4d689819bc791ee05bedd1faa0b00c49ff91c62')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
-
-prepare() {
-  cd "rustc-$pkgver-src"
-
-  patch -p1 <"$srcdir"/0001-librustc_llvm-build-Force-link-against-libffi.patch
-  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' 'llvm-libs')
-
-  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:

Copied: rust/repos/community-x86_64/PKGBUILD (from rev 247368, rust/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-08-01 18:14:40 UTC (rev 247369)
@@ -0,0 +1,78 @@
+# $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.19.0
+pkgrel=3
+
+pkgdesc='Systems programming language focused on safety, speed and concurrency'
+url='https://www.rust-lang.org/'
+arch=('x86_64' 'i686')
+license=('MIT' 'Apache')
+
+makedepends=('rust' 'cargo' 'libffi' 'perl' 'python2' 'curl' 'llvm' 'cmake')
+
+options=('!emptydirs')
+
+source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+        0001-librustc_llvm-build-Force-link-against-libffi.patch
+        bootstrap-config.toml)
+
+sha256sums=('15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51'
+            'SKIP'
+            '563529da8e02f575ddde7247d5fc5350d74031daa54743b86d075f3c45ae2713'
+            '4252d4873a840216115ee306e4d689819bc791ee05bedd1faa0b00c49ff91c62')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
+
+prepare() {
+  cd "rustc-$pkgver-src"
+
+  patch -p1 <"$srcdir"/0001-librustc_llvm-build-Force-link-against-libffi.patch
+  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' 'llvm-libs')
+  provides=('cargo')
+  conflicts=('cargo')
+  replaces=('cargo')
+
+
+  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:

Copied: rust/repos/community-x86_64/bootstrap-config.toml (from rev 247368, rust/trunk/bootstrap-config.toml)
===================================================================
--- community-x86_64/bootstrap-config.toml	                        (rev 0)
+++ community-x86_64/bootstrap-config.toml	2017-08-01 18:14:40 UTC (rev 247369)
@@ -0,0 +1,27 @@
+[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]
+codegen-units = 0
+debuginfo = true
+
+# Whether or not line number debug information is emitted
+#debuginfo-lines = false
+
+channel = "stable"
+
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"
+
+[target.i686-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"



More information about the arch-commits mailing list