From 479f5541729e47028c5d5a56153d0ffebbde6559 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 2 Aug 2017 00:03:30 +0000 Subject: [PATCH] community/rust to 1.19.0-3 --- community/rust/PKGBUILD | 12 ++-- community/rust/bootstrap-config.toml | 92 +--------------------------- 2 files changed, 9 insertions(+), 95 deletions(-) diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD index 9ef5a686a..cf169a10c 100644 --- a/community/rust/PKGBUILD +++ b/community/rust/PKGBUILD @@ -6,7 +6,6 @@ # ALARM: Kevin Mihelich # - add a link to g++ to compensate for broken cross-compiler decisions -# - makedepend on cmake buildarch=28 highmem=1 @@ -14,14 +13,14 @@ highmem=1 pkgname=('rust' 'rust-docs') epoch=1 pkgver=1.19.0 -pkgrel=1 +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' 'jemalloc' 'cmake') +makedepends=('rust' 'libffi' 'perl' 'python2' 'curl' 'llvm' 'cmake') options=('!emptydirs') @@ -32,7 +31,7 @@ source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} sha256sums=('15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51' 'SKIP' '563529da8e02f575ddde7247d5fc5350d74031daa54743b86d075f3c45ae2713' - '8b25eaee73ad3f349300b6d2b752df5e54abaad0555953db1b294294c5a1a6c9') + '4252d4873a840216115ee306e4d689819bc791ee05bedd1faa0b00c49ff91c62') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) prepare() { @@ -57,7 +56,10 @@ build() { package_rust() { depends=('gcc-libs' 'llvm-libs') - optdepends=('cargo') + provides=('cargo') + conflicts=('cargo') + replaces=('cargo') + cd "rustc-$pkgver-src" diff --git a/community/rust/bootstrap-config.toml b/community/rust/bootstrap-config.toml index 349fe1e19..c721bd81a 100644 --- a/community/rust/bootstrap-config.toml +++ b/community/rust/bootstrap-config.toml @@ -1,115 +1,27 @@ -# All options are commented out by default in this file, and they're commented -# out with their default values. The build system by default looks for -# `config.toml` in the current directory of a build for build configuration, but -# a custom configuration file can also be specified with `--config` to the build -# system. - -# ============================================================================= -# Tweaking how LLVM is compiled -# ============================================================================= -[llvm] - -# Indicates whether ccache is used when building LLVM -#ccache = false -# or alternatively ... -#ccache = "/path/to/ccache" - -# LLVM targets to build support for. -# Note: this is NOT related to Rust compilation targets. However, as Rust is -# dependent on LLVM for code generation, turning targets off here WILL lead to -# the resulting rustc being unable to compile for the disabled architectures. -# Also worth pointing out is that, in case support for new targets are added to -# LLVM, enabling them here doesn't mean Rust is automatically gaining said -# support. You'll need to write a target specification at least, and most -# likely, teach rustc about the C ABI of the target. Get in touch with the -# Rust team and file an issue if you need assistance in porting! -#targets = "X86;ARM;AArch64;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX;Hexagon" - -# Cap the number of parallel linker invocations when compiling LLVM. -# This can be useful when building LLVM with debug info, which significantly -# increases the size of binaries and consequently the memory required by -# 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 - -# ============================================================================= -# General build configuration options -# ============================================================================= [build] - -# Instead of downloading the src/stage0.txt version of Cargo specified, use -# this Cargo binary instead to build all Rust code cargo = "/usr/bin/cargo" - -# Instead of downloading the src/stage0.txt version of the compiler -# specified, use this rustc binary instead as the stage0 snapshot compiler. rustc = "/usr/bin/rustc" - -# 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. python = "python2.7" - +extended = true # Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose -verbose = 1 - +verbose = 0 # Build the sanitizer runtimes #sanitizers = false -# ============================================================================= -# General install configuration options -# ============================================================================= [install] - -# Instead of installing to /usr/local, install to this path instead. prefix = "/usr" -# ============================================================================= -# Options for compiling Rust code itself -# ============================================================================= [rust] - -# Number of codegen units to use for each compiler invocation. A value of 0 -# means "the number of cores on this machine", and 1+ is passed through to the -# compiler. codegen-units = 0 - -# Whether or not debuginfo is emitted debuginfo = true # Whether or not line number debug information is emitted #debuginfo-lines = false -# The "channel" for the Rust build to produce. The stable/beta channels only -# allow using stable features, whereas the nightly and dev channels allow using -# nightly features channel = "stable" -# ============================================================================= -# Options for specific targets -# -# Each of the following options is scoped to the specific target triple in -# question and is used for determining how to compile each target. -# ============================================================================= [target.x86_64-unknown-linux-gnu] - -# Path to the `llvm-config` binary of the installation of a custom LLVM to link -# against. Note that if this is specifed we don't compile LLVM at all for this -# target. llvm-config = "/usr/bin/llvm-config" -# Path to the custom jemalloc static library to link into the standard library -# by default. This is only used if jemalloc is still enabled above -jemalloc = "/usr/lib/libjemalloc_pic.a" - [target.i686-unknown-linux-gnu] - -# Path to the `llvm-config` binary of the installation of a custom LLVM to link -# against. Note that if this is specifed we don't compile LLVM at all for this -# target. llvm-config = "/usr/bin/llvm-config" - -# Path to the custom jemalloc static library to link into the standard library -# by default. This is only used if jemalloc is still enabled above -jemalloc = "/usr/lib/libjemalloc_pic.a"