update to 2.3.13, use ninja, use plain build, use arg to adjust libdir

2 files changed, 24 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9628a90b917c..761aa263b352 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Aug 12 20:29:41 UTC 2018
 pkgbase = bear
 	pkgdesc = tool to generate compilation database for clang tooling
-	pkgver = 2.3.12
+	pkgver = 2.3.13
 	pkgrel = 1
 	url = https://github.com/rizsotto/Bear
 	arch = i686
@@ -13,8 +11,8 @@ pkgbase = bear
 	depends = python>=2.7
 	provides = bear
 	conflicts = bear
-	source = https://github.com/rizsotto/Bear/archive/2.3.12.tar.gz
-	md5sums = 9e3620c63766d040d71cf942373544d7
+	source = https://github.com/rizsotto/Bear/archive/2.3.13.tar.gz
+	md5sums = 879e8093b26ad903a3aa1a2a690e052e
 
 pkgname = bear
 
diff --git a/PKGBUILD b/PKGBUILD
index d792981cf8ab..eb7f717f69e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,38 +2,42 @@
 
 pkgname=bear
 _pkgname=Bear
-pkgver=2.3.12
+pkgver=2.3.13
 pkgrel=1
 pkgdesc="tool to generate compilation database for clang tooling"
 arch=('i686' 'x86_64')
 url="https://github.com/rizsotto/Bear"
 license=('GPL3')
-makedepends=('cmake' 'make')
+makedepends=('cmake' 'ninja')
 depends=('python>=2.7')
 conflicts=('bear')
 provides=('bear')
 source=(https://github.com/rizsotto/$_pkgname/archive/$pkgver.tar.gz)
-md5sums=('9e3620c63766d040d71cf942373544d7')
+md5sums=('879e8093b26ad903a3aa1a2a690e052e')
 
-build() {
+prepare() {
 	cd "$srcdir/$_pkgname-$pkgver"
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-    .
-	make all
+	mkdir -p build
+}
+
+build() {
+	cd "$srcdir/$_pkgname-$pkgver/build"
+	cmake \
+		-GNinja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+		-DCMAKE_BUILD_TYPE=plain \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		..
+	cmake --build . -- -v
 }
 
 check() {
-	cd "$srcdir/$_pkgname-$pkgver"
-  PATH=/usr/bin:$PATH make -k check
+	cd "$srcdir/$_pkgname-$pkgver/build"
+	cmake --build . -- -v check
 }
 
 package() {
-	cd "$srcdir/$_pkgname-$pkgver"
-	make DESTDIR="$pkgdir/" install
-
-  if [ $CARCH = "x86_64" ]; then
-    mv $pkgdir/usr/lib64 $pkgdir/usr/lib
-  fi
+	cd "$srcdir/$_pkgname-$pkgver/build"
+	DESTDIR="$pkgdir" cmake --build . -- -v install
 }