[arch-commits] Commit in rust/trunk (PKGBUILD config.toml)

2019-09-28 Thread Johannes Löthberg via arch-commits 
Date: Saturday, September 28, 2019 @ 13:55:49
  Author: demize
Revision: 363505

Merge lib32-rust into being split from the rust package

Modified:
  rust/trunk/PKGBUILD
  rust/trunk/config.toml

-+
 PKGBUILD|   24 +++-
 config.toml |2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-28 13:55:04 UTC (rev 363504)
+++ PKGBUILD2019-09-28 13:55:49 UTC (rev 363505)
@@ -3,9 +3,7 @@
 # Contributor: Daniel Micay 
 # Contributor: userwithuid 
 
-# Remember to bump lib32-rust as well!
-
-pkgname=('rust' 'rust-docs')
+pkgname=('rust' 'lib32-rust-libs' 'rust-docs')
 epoch=1
 pkgver=1.37.0
 pkgrel=2
@@ -17,7 +15,7 @@
 arch=('x86_64')
 license=('MIT' 'Apache')
 
-makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
+makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'lib32-gcc-libs' 'perl' 
'python' 'curl' 'cmake')
 checkdepends=('procps-ng' 'gdb')
 
 options=('!emptydirs')
@@ -30,7 +28,7 @@
 'SKIP'
 '11828fb4823387d820c6715b25f6b2405e60837d12a7469e7a8882911c721837'
 'SKIP'
-'07affeba0bf6a50ebfcc47b436cccfa01990802ad8fe567d1f3c9922a8fe')
+'f3872bf7ae2818a14daa9abaf4ea728820a6c673ad86c809de894f3ff2b9')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag 
and Release Signing Key) 
   '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard 

 
@@ -74,6 +72,22 @@
   mv "$pkgdir"/etc/bash_completion.d/ 
"$pkgdir"/usr/share/bash-completion/completions/
 }
 
+package_lib32-rust-libs() {
+  descriptino=('32-bit libraries for Rust')
+  depends=('lib32-gcc-libs')
+  provides=('lib32-rust')
+  conflicts=('lib32-rust')
+  replaces=('lib32-rust')
+
+  install -d "$pkgdir"/usr/lib/rustlib/
+  mv "$srcdir"/i686-unknown-linux-gnu "$pkgdir"/usr/lib/rustlib
+
+  cd "rustc-$pkgver-src"
+  for license in APACHE MIT; do
+install -Dm644 "LICENSE-$license" 
"$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"
+  done
+}
+
 package_rust-docs() {
   install -d "$pkgdir/usr/share/doc/"
   mv "$srcdir"/doc/* "$pkgdir"/usr/share/doc/rust/

Modified: config.toml
===
--- config.toml 2019-09-28 13:55:04 UTC (rev 363504)
+++ config.toml 2019-09-28 13:55:49 UTC (rev 363505)
@@ -2,7 +2,7 @@
 link-shared = true
 
 [build]
-target = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple
+target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
 cargo = "/usr/bin/cargo"
 rustc = "/usr/bin/rustc"
 python = "python"

[arch-commits] Commit in rust/trunk (PKGBUILD config.toml)

2019-08-19 Thread Jan Steffens via arch-commits 
Date: Tuesday, August 20, 2019 @ 04:30:23
  Author: heftig
Revision: 359970

1.37.0-2: enable profiling

Modified:
  rust/trunk/PKGBUILD
  rust/trunk/config.toml

-+
 PKGBUILD|   17 +
 config.toml |3 +++
 2 files changed, 16 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-20 00:32:47 UTC (rev 359969)
+++ PKGBUILD2019-08-20 04:30:23 UTC (rev 359970)
@@ -8,25 +8,31 @@
 pkgname=('rust' 'rust-docs')
 epoch=1
 pkgver=1.37.0
-pkgrel=1
+pkgrel=2
 
+_llvm_ver=8.0.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' 'python' 'curl' 'cmake')
+makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
 checkdepends=('procps-ng' 'gdb')
 
 options=('!emptydirs')
 
 source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+
"https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}
 config.toml)
 
 sha256sums=('120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3'
 'SKIP'
-'24a5fbf558c7ffb39b3e712f26e0261a2e1f35d2caff17981e828c36bb5c746a')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag 
and Release Signing Key) 
+'11828fb4823387d820c6715b25f6b2405e60837d12a7469e7a8882911c721837'
+'SKIP'
+'07affeba0bf6a50ebfcc47b436cccfa01990802ad8fe567d1f3c9922a8fe')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag 
and Release Signing Key) 
+  '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard 

 
 prepare() {
   cd "rustc-$pkgver-src"
@@ -37,6 +43,9 @@
 build() {
   cd "rustc-$pkgver-src"
 
+  export RUST_BACKTRACE=1
+  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
+
   python ./x.py build -j"$(nproc)"
 }
 

Modified: config.toml
===
--- config.toml 2019-08-20 00:32:47 UTC (rev 359969)
+++ config.toml 2019-08-20 04:30:23 UTC (rev 359970)
@@ -2,11 +2,14 @@
 link-shared = true
 
 [build]
+target = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple
 cargo = "/usr/bin/cargo"
 rustc = "/usr/bin/rustc"
 python = "python"
 extended = true
 sanitizers = false
+profiler = true
+local-rebuild = false
 
 [install]
 prefix = "/usr"

[arch-commits] Commit in rust/trunk (PKGBUILD config.toml)

2019-08-16 Thread Johannes Löthberg via arch-commits 
Date: Friday, August 16, 2019 @ 09:10:04
  Author: demize
Revision: 359886

upgpkg: rust 1:1.37.0-1

Modified:
  rust/trunk/PKGBUILD
  rust/trunk/config.toml

-+
 PKGBUILD|6 +++---
 config.toml |3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-16 08:13:48 UTC (rev 359885)
+++ PKGBUILD2019-08-16 09:10:04 UTC (rev 359886)
@@ -7,7 +7,7 @@
 
 pkgname=('rust' 'rust-docs')
 epoch=1
-pkgver=1.36.0
+pkgver=1.37.0
 pkgrel=1
 
 pkgdesc='Systems programming language focused on safety, speed and concurrency'
@@ -23,9 +23,9 @@
 source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
 config.toml)
 
-sha256sums=('04c4e4d7213d036d6aaed392841496d272146312c0290f728b7400fccd15bb1b'
+sha256sums=('120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3'
 'SKIP'
-'fa531e162f2bb06f85171df1a91e339b4c2e276dd4b8cd7448c0675d343ae80b')
+'24a5fbf558c7ffb39b3e712f26e0261a2e1f35d2caff17981e828c36bb5c746a')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag 
and Release Signing Key) 
 
 prepare() {

Modified: config.toml
===
--- config.toml 2019-08-16 08:13:48 UTC (rev 359885)
+++ config.toml 2019-08-16 09:10:04 UTC (rev 359886)
@@ -16,8 +16,7 @@
 # https://github.com/rust-lang/rust/issues/47745
 codegen-units = 1
 
-debuginfo = true
-debuginfo-lines = true
+debuginfo-level = 2
 
 channel = "stable"

[arch-commits] Commit in rust/trunk (PKGBUILD config.toml)

2019-04-26 Thread Johannes Löthberg via arch-commits 
Date: Friday, April 26, 2019 @ 22:55:49
  Author: demize
Revision: 352154

upgpkg: rust 1:1.34.1-1

Modified:
  rust/trunk/PKGBUILD
  rust/trunk/config.toml

-+
 PKGBUILD|   12 ++--
 config.toml |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-26 22:05:24 UTC (rev 352153)
+++ PKGBUILD2019-04-26 22:55:49 UTC (rev 352154)
@@ -7,7 +7,7 @@
 
 pkgname=('rust' 'rust-docs')
 epoch=1
-pkgver=1.34.0
+pkgver=1.34.1
 pkgrel=1
 
 pkgdesc='Systems programming language focused on safety, speed and concurrency'
@@ -15,7 +15,7 @@
 arch=('x86_64')
 license=('MIT' 'Apache')
 
-makedepends=('rust' 'llvm' 'libffi' 'perl' 'python2' 'curl' 'cmake')
+makedepends=('rust' 'llvm' 'libffi' 'perl' 'python' 'curl' 'cmake')
 checkdepends=('procps-ng' 'gdb')
 
 options=('!emptydirs')
@@ -23,9 +23,9 @@
 source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
 config.toml)
 
-sha256sums=('7ac85acffd79dd3a7c44305d9eaabd1f1e7116e2e6e11e770e4bf5f92c0f1f59'
+sha256sums=('b0c785264d17e1dac4598627c248a2d5e07dd39bd1881fcfc8e2cf4c40a7'
 'SKIP'
-'ce1c2648e70a14362d33d0cbbd3e35846ea9d43a8d0abc36071563fc087b82d5')
+'fa531e162f2bb06f85171df1a91e339b4c2e276dd4b8cd7448c0675d343ae80b')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag 
and Release Signing Key) 
 
 prepare() {
@@ -37,7 +37,7 @@
 build() {
   cd "rustc-$pkgver-src"
 
-  python2 ./x.py build -j"$(nproc)"
+  python ./x.py build -j"$(nproc)"
 }
 
 package_rust() {
@@ -48,7 +48,7 @@
 
   cd "rustc-$pkgver-src"
 
-  DESTDIR="$pkgdir" python2 ./x.py install
+  DESTDIR="$pkgdir" python ./x.py install
 
   for license in APACHE MIT; do install -Dm644 "LICENSE-$license" \
 "$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done

Modified: config.toml
===
--- config.toml 2019-04-26 22:05:24 UTC (rev 352153)
+++ config.toml 2019-04-26 22:55:49 UTC (rev 352154)
@@ -4,7 +4,7 @@
 [build]
 cargo = "/usr/bin/cargo"
 rustc = "/usr/bin/rustc"
-python = "python2.7"
+python = "python"
 extended = true
 sanitizers = false

[arch-commits] Commit in rust/trunk (PKGBUILD config.toml)

2018-10-09 Thread Johannes Löthberg via arch-commits 
Date: Tuesday, October 9, 2018 @ 15:35:09
  Author: demize
Revision: 391642

upgpkg: rust 1:1.29.1-1

Also build with system LLVM

Modified:
  rust/trunk/PKGBUILD
  rust/trunk/config.toml

-+
 PKGBUILD|   27 +++
 config.toml |6 +++---
 2 files changed, 14 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-09 14:12:34 UTC (rev 391641)
+++ PKGBUILD2018-10-09 15:35:09 UTC (rev 391642)
@@ -7,8 +7,8 @@
 
 pkgname=('rust' 'rust-docs')
 epoch=1
-pkgver=1.29.0
-pkgrel=2
+pkgver=1.29.1
+pkgrel=1
 
 pkgdesc='Systems programming language focused on safety, speed and concurrency'
 url='https://www.rust-lang.org/'
@@ -15,24 +15,22 @@
 arch=('x86_64')
 license=('MIT' 'Apache')
 
-makedepends=('rust' 'libffi' 'perl' 'python2' 'curl' 'cmake' 'ninja')
+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
-
https://github.com/rust-lang/rust/commit/1b94b84ad0143ea2039610e3aec9e929a8a20733.patch)
+config.toml)
 
-sha256sums=('a4eb34ffd47f76afe2abd813f398512d5a19ef00989d37306217c9c9ec2f61e9'
+sha256sums=('f1b0728b66ce6bce6d72bbe5ea9e3a24ea22a045665da2ed8fcdfad14f61a349'
 'SKIP'
-'ff4890bd733509b0dbb885d69afd578c41fc583af256dcc81e9239339c60b144'
-'8c8e79b0bac0dd1434c49f665abfa50634ffb0fbb35c9efee511e5b97960b9e2')
+'ce1c2648e70a14362d33d0cbbd3e35846ea9d43a8d0abc36071563fc087b82d5')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag 
and Release Signing Key) 
 
 prepare() {
   cd "rustc-$pkgver-src"
 
-  patch -p1 <"$srcdir"/1b94b84ad0143ea2039610e3aec9e929a8a20733.patch
   cp "$srcdir"/config.toml config.toml
 }
 
@@ -39,17 +37,15 @@
 build() {
   cd "rustc-$pkgver-src"
 
-  msg2 "Run build under x.py"
-  python2 ./x.py build
+  python2 ./x.py build -j"$(nproc)"
 }
 
 package_rust() {
-  depends=('gcc-libs' 'curl' 'libssh2')
+  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
@@ -62,8 +58,8 @@
   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/"
+  # 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/
@@ -70,7 +66,6 @@
 }
 
 package_rust-docs() {
-  msg2 "Packaging documentation"
   install -d "$pkgdir/usr/share/doc/"
   mv "$srcdir"/doc/* "$pkgdir"/usr/share/doc/rust/
 

Modified: config.toml
===
--- config.toml 2018-10-09 14:12:34 UTC (rev 391641)
+++ config.toml 2018-10-09 15:35:09 UTC (rev 391642)
@@ -1,5 +1,5 @@
 [llvm]
-ninja = true
+link-shared = true
 
 [build]
 cargo = "/usr/bin/cargo"
@@ -23,5 +23,5 @@
 
 rpath = false
 
-# Work around https://github.com/rust-lang/rust/issues/51650
-deny-warnings = false
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"

[arch-commits] Commit in rust/trunk (PKGBUILD config.toml)

2018-07-10 Thread Johannes Löthberg via arch-commits 
Date: Tuesday, July 10, 2018 @ 19:01:36
  Author: demize
Revision: 356408

upgpkg: rust 1:1.27.1-1

Modified:
  rust/trunk/PKGBUILD
  rust/trunk/config.toml

-+
 PKGBUILD|6 +++---
 config.toml |3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-10 18:50:37 UTC (rev 356407)
+++ PKGBUILD2018-07-10 19:01:36 UTC (rev 356408)
@@ -8,7 +8,7 @@
 
 pkgname=('rust' 'rust-docs')
 epoch=1
-pkgver=1.27.0
+pkgver=1.27.1
 pkgrel=1
 
 pkgdesc='Systems programming language focused on safety, speed and concurrency'
@@ -23,9 +23,9 @@
 source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
 config.toml)
 
-sha256sums=('2cb9803f690349c9fd429564d909ddd4676c68dc48b670b8ddf797c2613e2d21'
+sha256sums=('2133beb01ddc3aa09eebc769dd884533c6cfb08ce684f042497e097068d733d1'
 'SKIP'
-'c0988fa7cb0dd3686379df9e0c45104895b69519a258f8a4ae56bd6af1670639')
+'ff4890bd733509b0dbb885d69afd578c41fc583af256dcc81e9239339c60b144')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag 
and Release Signing Key) 
 
 prepare() {

Modified: config.toml
===
--- config.toml 2018-07-10 18:50:37 UTC (rev 356407)
+++ config.toml 2018-07-10 19:01:36 UTC (rev 356408)
@@ -22,3 +22,6 @@
 channel = "stable"
 
 rpath = false
+
+# Work around https://github.com/rust-lang/rust/issues/51650
+deny-warnings = false