summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-07-30 00:48:43 +0200
committerbartus2020-07-30 01:12:21 +0200
commit5657f1b78e98734eb4fb04c25a095b13de221307 (patch)
tree8e26aed5e0d3d8175456c21a1ade791fea163933
parentf986b29600ae6a4aff4ad6e261c524cbb933a4a4 (diff)
downloadaur-5657f1b78e98734eb4fb04c25a095b13de221307.tar.gz
Switch from gnu-make to ninja build.
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6097936d3f..21002782c71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = blender-git
makedepends = cmake
makedepends = boost
makedepends = mesa
+ makedepends = ninja
makedepends = llvm
depends = alembic
depends = libgl
diff --git a/PKGBUILD b/PKGBUILD
index 48c1d3f5f3a..d1b86c68472 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ depends+=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg2'
optdepends=('cuda: CUDA support in Cycles'
'optix: OptiX support in Cycles'
'openimagedenoise: Intel Open Image Denoise support in compositing')
-makedepends=('git' 'cmake' 'boost' 'mesa' 'llvm')
+makedepends=('git' 'cmake' 'boost' 'mesa' 'ninja' 'llvm')
provides=('blender')
conflicts=('blender')
license=('GPL')
@@ -85,7 +85,7 @@ build() {
_CMAKE_FLAGS+=( -DWITH_OPENIMAGEDENOISE=ON )
fi
- cmake -S "$srcdir/blender" -B build \
+ cmake -G Ninja -S "$srcdir/blender" -B build \
-C "${srcdir}/blender/build_files/cmake/config/blender_release.cmake" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
@@ -94,12 +94,12 @@ build() {
-DWITH_PYTHON_INSTALL=OFF \
-DPYTHON_VERSION="${_pyver}" \
"${_CMAKE_FLAGS[@]}"
- make
+ ninja -C "$srcdir/build" ${MAKEFLAGS:--j1}
}
package() {
_suffix=${pkgver%%.r*}
- make -C "$srcdir/build" DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C "$srcdir/build" install
if [[ -e "$pkgdir/usr/share/blender/${_suffix}/scripts/addons/cycles/lib/" ]] ; then
# make sure the cuda kernels are not stripped