Date: Saturday, December 9, 2017 @ 12:17:55 Author: demize Revision: 273384
db-move: moved rust from [community-testing] to [community] (x86_64) Added: rust/repos/community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch (from rev 273383, rust/repos/community-testing-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch) rust/repos/community-x86_64/PKGBUILD (from rev 273383, rust/repos/community-testing-x86_64/PKGBUILD) rust/repos/community-x86_64/bootstrap-config.toml (from rev 273383, rust/repos/community-testing-x86_64/bootstrap-config.toml) Deleted: rust/repos/community-testing-x86_64/ 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 | 32 ++++ /PKGBUILD | 75 ++++++++++ /bootstrap-config.toml | 21 ++ community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch | 32 ---- community-x86_64/PKGBUILD | 75 ---------- community-x86_64/bootstrap-config.toml | 21 -- 6 files changed, 128 insertions(+), 128 deletions(-) Deleted: community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch =================================================================== --- community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch 2017-12-08 19:55:22 UTC (rev 273383) +++ community-x86_64/0001-librustc_llvm-build-Force-link-against-libffi.patch 2017-12-09 12:17:55 UTC (rev 273384) @@ -1,32 +0,0 @@ -From 5dbc650a60ddb230f59e5a18ffd298b033566945 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@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 <johan...@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 273383, rust/repos/community-testing-x86_64/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-12-09 12:17:55 UTC (rev 273384) @@ -0,0 +1,32 @@ +From 5dbc650a60ddb230f59e5a18ffd298b033566945 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@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 <johan...@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-12-08 19:55:22 UTC (rev 273383) +++ community-x86_64/PKGBUILD 2017-12-09 12:17:55 UTC (rev 273384) @@ -1,75 +0,0 @@ -# $Id$ -# 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> - -pkgname=('rust' 'rust-docs') -epoch=1 -pkgver=1.21.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' 'libffi' 'perl' 'python2' 'curl' 'cmake') - -options=('!emptydirs') - -source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} - bootstrap-config.toml) - -sha256sums=('1707c142244b5bd909993559c6116c81987c1de21d6207c05d3ecbe5bba548fa' - 'SKIP' - '6c25c451d6286efd19e96a552406c8b299345749577cf924699cf4c3831d9ad0') -validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-...@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' '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/PKGBUILD (from rev 273383, rust/repos/community-testing-x86_64/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-12-09 12:17:55 UTC (rev 273384) @@ -0,0 +1,75 @@ +# $Id$ +# 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> + +pkgname=('rust' 'rust-docs') +epoch=1 +pkgver=1.22.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=('8b7a42bdd6eb205a8c533eb41b5c42389a88158d060aed1e0f461f68c1fd3fd3' + 'SKIP' + '6c25c451d6286efd19e96a552406c8b299345749577cf924699cf4c3831d9ad0') +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-...@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' '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: Deleted: community-x86_64/bootstrap-config.toml =================================================================== --- community-x86_64/bootstrap-config.toml 2017-12-08 19:55:22 UTC (rev 273383) +++ community-x86_64/bootstrap-config.toml 2017-12-09 12:17:55 UTC (rev 273384) @@ -1,21 +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] -codegen-units = 0 -debuginfo = true - -# Whether or not line number debug information is emitted -#debuginfo-lines = false - -channel = "stable" Copied: rust/repos/community-x86_64/bootstrap-config.toml (from rev 273383, rust/repos/community-testing-x86_64/bootstrap-config.toml) =================================================================== --- community-x86_64/bootstrap-config.toml (rev 0) +++ community-x86_64/bootstrap-config.toml 2017-12-09 12:17:55 UTC (rev 273384) @@ -0,0 +1,21 @@ +[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"