summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Perez de Castro2016-06-07 15:44:25 +0300
committerAdrian Perez de Castro2016-06-07 15:44:25 +0300
commit5c8be1594ecb938d8ee7f16c37677e146ebed241 (patch)
tree9ca04202842ff2ec7e7acd50983ec0c0a4f12dbf
parent3ff41cfbeeef250f109612bb7f13237a4a1a2139 (diff)
downloadaur-5c8be1594ecb938d8ee7f16c37677e146ebed241.tar.gz
Remove ninja binaries and use system-wide ninja
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD15
2 files changed, 15 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f26360c19f4..52297d5a421 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = depot-tools-git
pkgdesc = Build tools for working with Chromium development, include gclient
pkgver = r3323.3bff56b
- pkgrel = 4
+ pkgrel = 5
url = http://dev.chromium.org/developers/how-tos/install-depot-tools
install = depot_tools.install
arch = any
@@ -10,6 +10,7 @@ pkgbase = depot-tools-git
depends = python2
depends = python2-colorama
depends = python2-pylint
+ depends = ninja
provides = depot_tools
provides = gclient
conflicts = gclient-svn
diff --git a/PKGBUILD b/PKGBUILD
index 2df17b20f04..eea16e3dbb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,14 @@
pkgname=depot-tools-git
pkgver=r3323.3bff56b
-pkgrel=4
+pkgrel=5
pkgdesc='Build tools for working with Chromium development, include gclient'
arch=('any')
url='http://dev.chromium.org/developers/how-tos/install-depot-tools'
source=("${pkgname}::git+https://chromium.googlesource.com/chromium/tools/depot_tools.git"
'depot_tools.sh' 'repo_fix.sh' 'fixshebangs.py')
license=('Custom')
-depends=('python2' 'python2-colorama' 'python2-pylint')
+depends=('python2' 'python2-colorama' 'python2-pylint' 'ninja')
makedepends=('git')
provides=('depot_tools' 'gclient')
conflicts=('gclient-svn' 'depot_tools-svn')
@@ -100,5 +100,16 @@ package()
# Remove stray files
rm -r "${pkgdir}/opt/depot_tools/man"
+ # We depend on the "ninja" package, so the wrapper script which chooses a
+ # prebuilt version of it or makes a local build is not needed at all, so
+ # those are removed and a wrapper script which runs the system-installed
+ # /usr/bin/ninja is created instead.
+ rm "${pkgdir}/opt/depot_tools"/ninja*
+ cat > "${pkgdir}/opt/depot_tools/ninja" <<-EOF
+ #! /bin/sh
+ exec /usr/bin/ninja
+ EOF
+ chmod 755 "${pkgdir}/opt/depot_tools/ninja"
+
rm -rf "${pkgdir}/opt/depot_tools/.git"
}