From 4e142f3fa74d0e59f7ca78f651416b9cdd365f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 16 Oct 2016 01:47:00 +0200 Subject: [PATCH] package/archlinux: use Ninja for Emscripten builds. --- package/archlinux/PKGBUILD-emscripten | 9 +++++---- package/archlinux/PKGBUILD-emscripten-webgl2 | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten index e11e05b0a..b7f99e3a9 100644 --- a/package/archlinux/PKGBUILD-emscripten +++ b/package/archlinux/PKGBUILD-emscripten @@ -7,7 +7,7 @@ arch=('any') url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('emscripten-corrade') -makedepends=('cmake' 'emscripten' 'corrade') +makedepends=('cmake' 'emscripten' 'corrade' 'ninja') options=('!strip' '!buildflags') _rootdir=$startdir/../../ @@ -19,7 +19,8 @@ build() { cmake .. \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Emscripten.cmake" \ - -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system + -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system \ + -G Ninja fi cd "$_rootdir/build-emscripten" @@ -35,7 +36,7 @@ build() { -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ -DBUILD_TESTS=ON - make -j4 + ninja } check() { @@ -45,5 +46,5 @@ check() { package() { cd "$_rootdir/build-emscripten" - DESTDIR="$pkgdir/" make install + DESTDIR="$pkgdir/" ninja install } diff --git a/package/archlinux/PKGBUILD-emscripten-webgl2 b/package/archlinux/PKGBUILD-emscripten-webgl2 index e8c83a6bd..f52f18ee2 100644 --- a/package/archlinux/PKGBUILD-emscripten-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-webgl2 @@ -7,7 +7,7 @@ arch=('any') url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('emscripten-corrade') -makedepends=('cmake' 'emscripten' 'corrade') +makedepends=('cmake' 'emscripten' 'corrade' 'ninja') options=('!strip' '!buildflags') _rootdir=$startdir/../../ @@ -19,7 +19,8 @@ build() { cmake .. \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Emscripten.cmake" \ - -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system + -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system \ + -G Ninja fi cd "$_rootdir/build-emscripten-webgl2" @@ -36,7 +37,7 @@ build() { -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ -DBUILD_TESTS=ON - make -j4 + ninja } check() { @@ -46,5 +47,5 @@ check() { package() { cd "$_rootdir/build-emscripten-webgl2" - DESTDIR="$pkgdir/" make install + DESTDIR="$pkgdir/" ninja install }