diff options
| author | Fangrui Song | 2017-12-14 22:39:24 -0800 |
|---|---|---|
| committer | Vic Luo | 2017-12-15 14:57:43 +0800 |
| commit | 61c8f57ba4e1b7f34c1f92bffed847087971c0a7 (patch) | |
| tree | fa0f7aa7f3abe82886013aca2c9c157b3dbb4fe1 | |
| parent | af1c45cc2cd7ac9b230422d75c9df06dc42b1b7d (diff) | |
| download | aur-61c8f57ba4e1b7f34c1f92bffed847087971c0a7.tar.gz | |
Use system clang
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 32 | ||||
| -rw-r--r-- | cquery-sh | 3 |
3 files changed, 12 insertions, 30 deletions
@@ -1,18 +1,15 @@ pkgbase = cquery-git pkgdesc = Low-latency vscode language server for large C++ code-bases, powered by libclang. - pkgver = 791.ebad9e2 + pkgver = 826.6c1126a pkgrel = 1 url = https://github.com/jacobdufault/cquery/ arch = any license = MIT makedepends = git - makedepends = python2 + makedepends = python depends = clang - depends = libtinfo5 source = git+https://github.com/jacobdufault/cquery.git - source = cquery-sh md5sums = SKIP - md5sums = cdefbd32658ab9c6a531deb64c512c5d pkgname = cquery-git @@ -2,18 +2,17 @@ pkgname=cquery-git _pkgname=cquery -pkgver=791.ebad9e2 +pkgver=826.6c1126a pkgrel=1 pkgdesc='Low-latency vscode language server for large C++ code-bases, powered by libclang.' arch=('any') url='https://github.com/jacobdufault/cquery/' license=('MIT') -depends=('clang' 'libtinfo5') -makedepends=("git" "python2") -source=('git+https://github.com/jacobdufault/cquery.git' 'cquery-sh') +depends=('clang') +makedepends=("git" "python") +source=('git+https://github.com/jacobdufault/cquery.git') md5sums=( 'SKIP' - 'cdefbd32658ab9c6a531deb64c512c5d' ) pkgver() { @@ -25,31 +24,20 @@ prepare() { cd $_pkgname git submodule update --init --recursive sed -e "s/, '-Werror'//g" -i ./wscript - sed -e "s/rpath=.*,/rpath=\['lib'\],/g" -i ./wscript } build() { cd $_pkgname - python2 waf configure - python2 waf build - cd build - ls -l lib || ln -s clang+llvm*/lib lib + python waf configure --prefix="$pkgdir/usr" --use-system-clang + python waf build } check() { - cd $_pkgname/build - ln -sf ../tests tests - yes | ./app --test-unit --test-index --clang-sanity-check + cd $_pkgname + yes | build/release/bin/cquery --test-unit --test-index --clang-sanity-check } package() { - install -m 755 -d "${pkgdir}/opt/cquery/" - cd $_pkgname/ - cp -rf ./clang_resource_dir ${pkgdir}/opt/cquery/ - cd build/ - install -m 755 ./app "${pkgdir}/opt/cquery/cquery" - install -m 755 -d "${pkgdir}/opt/cquery/lib" - install -m 755 -t "${pkgdir}/opt/cquery/lib" lib/*.so* - install -m 755 -d "${pkgdir}/usr/bin" - install -D -m 755 "${srcdir}/cquery-sh" "${pkgdir}/usr/bin/cquery" + cd $_pkgname + python waf install } diff --git a/cquery-sh b/cquery-sh deleted file mode 100644 index dbfd569ea6c4..000000000000 --- a/cquery-sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/bash -cd /opt/cquery -./cquery $@ |