summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpingplug2019-05-24 14:03:41 +0800
committerpingplug2019-05-25 23:24:40 +0800
commit4e20add0524c247beb1d06f37991fda4c8274d6f (patch)
tree85786f37e10039d3a9ce33bbd9453f04827b47fc
parent0cd77123c2c084c7cb65f3915e19cf97bbd3ed27 (diff)
downloadaur-4e20add0524c247beb1d06f37991fda4c8274d6f.tar.gz
Updated to 1.35.0
-rw-r--r--.SRCINFO36
-rw-r--r--PKGBUILD25
-rw-r--r--mingw-config.toml25
3 files changed, 53 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 789d5238d6ed..d59e7378b216 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-rust
pkgdesc = Systems programming language focused on safety, speed and concurrency (mingw-w64)
- pkgver = 1.34.2
+ pkgver = 1.35.0
pkgrel = 1
url = https://www.rust-lang.org
arch = x86_64
@@ -12,39 +12,41 @@ pkgbase = mingw-w64-rust
makedepends = libffi
makedepends = perl
makedepends = python
+ makedepends = python2
makedepends = nodejs
+ makedepends = procps-ng
makedepends = cmake
depends = gcc-libs
depends = curl
depends = libgit2
depends = mingw-w64-gcc
optdepends = mingw-w64-wine: for cargo test support
- noextract = rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz
- noextract = rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz
- noextract = cargo-0.34.0-x86_64-unknown-linux-gnu.tar.xz
+ noextract = rust-std-1.34.2-x86_64-unknown-linux-gnu.tar.xz
+ noextract = rustc-1.34.2-x86_64-unknown-linux-gnu.tar.xz
+ noextract = cargo-0.35.0-x86_64-unknown-linux-gnu.tar.xz
options = !strip
options = staticlibs
options = !buildflags
backup = opt/rust/cargo/config
- source = https://static.rust-lang.org/dist/rustc-1.34.2-src.tar.xz
- source = https://static.rust-lang.org/dist/rustc-1.34.2-src.tar.xz.asc
- source = https://static.rust-lang.org/dist/2019-02-28/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz
- source = https://static.rust-lang.org/dist/2019-02-28/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc
- source = https://static.rust-lang.org/dist/2019-02-28/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz
- source = https://static.rust-lang.org/dist/2019-02-28/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc
- source = https://static.rust-lang.org/dist/2019-02-28/cargo-0.34.0-x86_64-unknown-linux-gnu.tar.xz
- source = https://static.rust-lang.org/dist/2019-02-28/cargo-0.34.0-x86_64-unknown-linux-gnu.tar.xz.asc
+ source = https://static.rust-lang.org/dist/rustc-1.35.0-src.tar.xz
+ source = https://static.rust-lang.org/dist/rustc-1.35.0-src.tar.xz.asc
+ source = https://static.rust-lang.org/dist/2019-05-14/rust-std-1.34.2-x86_64-unknown-linux-gnu.tar.xz
+ source = https://static.rust-lang.org/dist/2019-05-14/rust-std-1.34.2-x86_64-unknown-linux-gnu.tar.xz.asc
+ source = https://static.rust-lang.org/dist/2019-05-14/rustc-1.34.2-x86_64-unknown-linux-gnu.tar.xz
+ source = https://static.rust-lang.org/dist/2019-05-14/rustc-1.34.2-x86_64-unknown-linux-gnu.tar.xz.asc
+ source = https://static.rust-lang.org/dist/2019-05-14/cargo-0.35.0-x86_64-unknown-linux-gnu.tar.xz
+ source = https://static.rust-lang.org/dist/2019-05-14/cargo-0.35.0-x86_64-unknown-linux-gnu.tar.xz.asc
source = mingw-config.toml
validpgpkeys = 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE
- sha256sums = 2b3b3a5462aa31d07f39721af73ef394803ceae3472e2470f28b7ee0b12e38ef
+ sha256sums = 169756df2298957bcf02da6a612996c24a51b9ac3b23409e6507d69eb2e6f523
sha256sums = SKIP
- sha256sums = 6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e
+ sha256sums = aaf63ed4d9ebfeade316b2923880df37839ee62f613799563be410cff84edddf
sha256sums = SKIP
- sha256sums = 57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1
+ sha256sums = ddd1f6353221658bf63ef296c9a0919ea78f9ddfdde0a159c4ff271300bdec7f
sha256sums = SKIP
- sha256sums = 1730c8ebcacc1327eb28b328cb9f5a2c612bb3d9efff9c350647adf19f304e15
+ sha256sums = ffa3dd54ef07cef1e8a7b702bc954a1cd4f4ae64faea83c6a3fb9b6e0bbcbd96
sha256sums = SKIP
- sha256sums = d7b86ebb3382c838cb931ed0292e4a8133dd524beed7abe0f3ab8d7bc5973d04
+ sha256sums = cff1ec08d6bf3d427e831828ac0597e7e724662ddee548a52478c41fa0c111c6
pkgname = mingw-w64-rust
diff --git a/PKGBUILD b/PKGBUILD
index 981a44d975d8..a632e5010dc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
# Contributor: userwithuid < userwithuid at gmail dot com >
_pkgname=rust
-_date=2019-02-28
-_rustc=1.33.0
-_cargo=0.34.0
+_date=2019-05-14
+_rustc=1.34.2
+_cargo=0.35.0
pkgname=mingw-w64-rust
_prefix=opt/rust
-pkgver=1.34.2
+pkgver=1.35.0
pkgrel=1
pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
arch=('x86_64')
@@ -27,7 +27,9 @@ makedepends=('gdb'
'libffi'
'perl'
'python'
+ 'python2'
'nodejs'
+ 'procps-ng'
'cmake')
options=('!strip' 'staticlibs' '!buildflags')
source=("https://static.rust-lang.org/dist/rustc-${pkgver}-src.tar.xz"{,.asc}
@@ -38,15 +40,15 @@ source=("https://static.rust-lang.org/dist/rustc-${pkgver}-src.tar.xz"{,.asc}
noextract=("rust-std-${_rustc}-x86_64-unknown-linux-gnu.tar.xz"
"rustc-${_rustc}-x86_64-unknown-linux-gnu.tar.xz"
"cargo-${_cargo}-x86_64-unknown-linux-gnu.tar.xz")
-sha256sums=('2b3b3a5462aa31d07f39721af73ef394803ceae3472e2470f28b7ee0b12e38ef'
+sha256sums=('169756df2298957bcf02da6a612996c24a51b9ac3b23409e6507d69eb2e6f523'
'SKIP'
- '6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e'
+ 'aaf63ed4d9ebfeade316b2923880df37839ee62f613799563be410cff84edddf'
'SKIP'
- '57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1'
+ 'ddd1f6353221658bf63ef296c9a0919ea78f9ddfdde0a159c4ff271300bdec7f'
'SKIP'
- '1730c8ebcacc1327eb28b328cb9f5a2c612bb3d9efff9c350647adf19f304e15'
+ 'ffa3dd54ef07cef1e8a7b702bc954a1cd4f4ae64faea83c6a3fb9b6e0bbcbd96'
'SKIP'
- 'd7b86ebb3382c838cb931ed0292e4a8133dd524beed7abe0f3ab8d7bc5973d04')
+ 'cff1ec08d6bf3d427e831828ac0597e7e724662ddee548a52478c41fa0c111c6')
validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
backup=("opt/rust/cargo/config")
@@ -57,9 +59,12 @@ prepare() {
cp "${srcdir}"/mingw-config.toml config.toml
sed -i "s|\@PREFIX\@|/${_prefix}|" config.toml
+ # use xz source
+ sed -i "s|tar.gz|tar.xz|" "src/bootstrap/bootstrap.py"
+ # fix path
+ sed -i "s|lld_install_root.join|lld_install_root.join(\"build\").join|" "src/bootstrap/compile.rs"
# use level 0 to speed up xz packaging
sed -i 's|XzEncoder::new(create_new_file(tar_xz)?, 6)|XzEncoder::new(create_new_file(tar_xz)?, 0)|' "src/tools/rust-installer/src/tarballer.rs"
- sed -i "s|tar.gz|tar.xz|" "src/bootstrap/bootstrap.py"
cd "${srcdir}"
mkdir -p "${srcdir}/rustc-${pkgver}-src/build/cache/${_date}"
diff --git a/mingw-config.toml b/mingw-config.toml
index 5069da0b05b0..e27d2b48fd3a 100644
--- a/mingw-config.toml
+++ b/mingw-config.toml
@@ -14,10 +14,6 @@
# =============================================================================
[llvm]
-# Indicates whether rustc will support compilation with LLVM
-# note: rustc does not compile without LLVM at the moment
-enabled = true
-
# Indicates whether the LLVM build is a Release or Debug build
optimize = true
@@ -76,7 +72,7 @@ experimental-targets = ""
# each linker process.
# If absent or 0, linker invocations are treated like any other job and
# controlled by rustbuild's -j parameter.
-link-jobs = 0
+link-jobs = 1
# When invoking `llvm-config` this configures whether the `--shared` argument is
# passed to prefer linking to shared libraries.
@@ -104,6 +100,8 @@ use-libcxx = false
# The value specified here will be passed as `-DLLVM_USE_LINKER` to CMake.
#use-linker = "lld"
+# Whether or not to specify `-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=YES`
+allow-old-toolchain = false
# =============================================================================
# General build configuration options
@@ -162,6 +160,9 @@ nodejs = "node"
# Python interpreter to use for various tasks throughout the build, notably
# rustdoc tests, the lldb python interpreter, and some dist bits and pieces.
# Note that Python 2 is currently required.
+#
+# Defaults to python2.7, then python2. If neither executable can be found, then
+# it defaults to the Python interpreter used to execute x.py.
python = "python2.7"
# Force Cargo to check that Cargo.lock describes the precise dependency
@@ -313,7 +314,7 @@ debuginfo-only-std = false
# Enable debuginfo for the extended tools: cargo, rls, rustfmt
# Adding debuginfo makes them several times larger.
-#debuginfo-tools = false
+debuginfo-tools = false
# Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
backtrace = true
@@ -420,6 +421,9 @@ jemalloc = false
# development of NLL
test-compare-mode = false
+# Use LLVM libunwind as the implementation for Rust's unwinder.
+llvm-libunwind = false
+
# =============================================================================
# Options for specific targets
#
@@ -476,6 +480,9 @@ crt-static = false
# linked binaries
#musl-root = "..."
+# The root location of the `wasm32-unknown-wasi` sysroot.
+#wasi-root = "..."
+
# Used in testing for configuring where the QEMU images are located, you
# probably don't want to use this.
#qemu-rootfs = "..."
@@ -530,6 +537,9 @@ crt-static = true
# linked binaries
#musl-root = "..."
+# The root location of the `wasm32-unknown-wasi` sysroot.
+#wasi-root = "..."
+
# Used in testing for configuring where the QEMU images are located, you
# probably don't want to use this.
#qemu-rootfs = "..."
@@ -584,6 +594,9 @@ crt-static = true
# linked binaries
#musl-root = "..."
+# The root location of the `wasm32-unknown-wasi` sysroot.
+#wasi-root = "..."
+
# Used in testing for configuring where the QEMU images are located, you
# probably don't want to use this.
#qemu-rootfs = "..."