[arch-commits] Commit in osquery/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Monday, March 8, 2021 @ 02:16:07
  Author: anatolik
Revision: 886878

Switch to ninja build tool that provides more helpful messages in case of build failure

Modified:
  osquery/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-08 02:07:56 UTC (rev 886877)
+++ PKGBUILD	2021-03-08 02:16:07 UTC (rev 886878)
@@ -8,7 +8,7 @@
 url='https://osquery.io'
 license=(Apache GPL2)
 depends=(augeas boost-libs gflags google-glog aws-sdk-cpp librdkafka rocksdb gtest device-mapper rpm-tools dpkg pacman lvm2 libelfin lldpd rapidjson sleuthkit ssdeep thrift yara lmdb iptables)
-makedepends=(cmake python boost linenoise-ng)
+makedepends=(cmake python boost linenoise-ng ninja)
 options=(!strip)
 # patched version of smartools that we need to build statically to avoid collision with the upstream version
 _smartmontools_commit=6afcf545d2ab86d13a3ecb9f656aa81622031f2a
@@ -16,7 +16,7 @@
 # lvm2 2.03.x does no longer support lvm2app, so linking statically
 _lvm2_version=2_02_173
 source=(osquery-$pkgver.zip::https://github.com/osquery/osquery/archive/$pkgver.zip
-        smartmontools-$_smartmontools_commit.zip::https://github.com/osquery/third-party-smartmontools/archive/$_smartmontools_commit.zip
+	smartmontools-$_smartmontools_commit.zip::https://github.com/osquery/third-party-smartmontools/archive/$_smartmontools_commit.zip
 	devendorize.patch::https://github.com/anatol/osquery/compare/$pkgver...$_patched_osquery_commit.patch
 	tls_crash.patch::https://github.com/osquery/osquery/commit/d69380cb7713dd5f7f48849a028a7723e7a619bf.patch
 	nolvm2app.patch)
@@ -39,7 +39,7 @@
 build() {
   cd osquery-$pkgver
 
-  cmake -DCMAKE_BUILD_TYPE=Release -DOSQUERY_STATIC_BUILD=OFF -DCMAKE_INSTALL_PREFIX=/usr -DOSQUERY_VERSION=$pkgver -S . -B build
+  cmake -DCMAKE_BUILD_TYPE=Release -DOSQUERY_STATIC_BUILD=OFF -DCMAKE_INSTALL_PREFIX=/usr -DOSQUERY_VERSION=$pkgver -G Ninja -S . -B build
   cmake --build build
 }
 
@@ -46,7 +46,7 @@
 package() {
   cd osquery-$pkgver
 
-  cmake --build build --target install -- DESTDIR="$pkgdir"
+  DESTDIR="${pkgdir}" ninja -C build install
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   rm -r "$pkgdir/etc/init.d/"
 }