aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-05-01 00:41:18 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-05-01 00:41:18 +0200
commit76a668d7dcc10d370ce8187a1461d156559e273a (patch)
tree64c316c825dd52fd046605306ccac69566c5ae67 /testing
parent0249bb6da51333a07e9fc3224cd3676ab78fc54d (diff)
downloadaports-76a668d7dcc10d370ce8187a1461d156559e273a.tar.bz2
aports-76a668d7dcc10d370ce8187a1461d156559e273a.tar.xz
testing/rust: re-enable -lldb subpackage
Diffstat (limited to 'testing')
-rw-r--r--testing/rust/APKBUILD25
1 files changed, 12 insertions, 13 deletions
diff --git a/testing/rust/APKBUILD b/testing/rust/APKBUILD
index 2c40bc54bb..9179ab50c1 100644
--- a/testing/rust/APKBUILD
+++ b/testing/rust/APKBUILD
@@ -7,7 +7,7 @@ pkgver=1.17.0
_cargo_gitrev=6b05583d71f982bcad049b9fa094c637c062e751
_llvmver=3.9
_bootver=1.16.0
-pkgrel=0
+pkgrel=1
pkgdesc="The Rust Programming Language (compiler)"
url="http://www.rust-lang.org"
arch="x86_64"
@@ -19,7 +19,7 @@ depends="$pkgname-stdlib=$pkgver-r$pkgrel gcc llvm-libunwind-dev musl-dev"
# libffi-dev is needed just because we compile llvm with LLVM_ENABLE_FFI.
makedepends="cmake file libffi-dev llvm$_llvmver-dev python2 tar zlib-dev"
subpackages="$pkgname-dbg $pkgname-stdlib
- $pkgname-gdb::noarch $pkgname-doc"
+ $pkgname-gdb::noarch $pkgname-lldb::noarch $pkgname-doc"
# XXX: Rust is self-hosted, so you need rustc to build rustc... The problem is
# that Rust doesn't provide prebuilt rustc for musl yet. Thus we use binaries
@@ -176,17 +176,16 @@ gdb() {
_mv "$pkgdir"/$_sharedir/etc/gdb_*.py $_sharedir/etc/
}
-# XXX: Uncomment once lldb aport is fixed.
-#lldb() {
-# pkgdesc="LLDB pretty printers for Rust"
-# depends="$pkgname lldb py-lldb"
-#
-# mkdir -p "$subpkgdir"
-# cd "$subpkgdir"
-#
-# _mv "$pkgdir"/usr/bin/rust-lldb usr/bin/
-# _mv "$pkgdir"/$_sharedir/etc/lldb_*.py $_sharedir/etc/
-#}
+lldb() {
+ pkgdesc="LLDB pretty printers for Rust"
+ depends="$pkgname lldb py-lldb"
+
+ mkdir -p "$subpkgdir"
+ cd "$subpkgdir"
+
+ _mv "$pkgdir"/usr/bin/rust-lldb usr/bin/
+ _mv "$pkgdir"/$_sharedir/etc/lldb_*.py $_sharedir/etc/
+}
_mv() {
local dest; for dest; do true; done # get last argument