Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages /
root
Commits:
cde9c6a8 by Jakub Klinkovský at 2024-05-04T22:20:13+02:00
Modernize cmake commands and switch to Ninja
Ninja builds faster than GNU Make and we don't like to wait.
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -19,6 +19,7 @@ pkgbase = root
makedepends = go
makedepends = libxml2
makedepends = libmariadbclient
+ makedepends = ninja
makedepends = ocaml
makedepends = ocaml-ctypes
makedepends = openmp
=====================================
PKGBUILD
=====================================
@@ -26,6 +26,7 @@ makedepends=(
'go'
'libxml2'
'libmariadbclient'
+ 'ninja'
'ocaml'
'ocaml-ctypes'
'openmp'
@@ -157,36 +158,28 @@ prepare() {
done
_cuda_arch_vals="${_cuda_arch_vals:0:-1}"
export CUSTOM_CUDA_ARCH='-DCMAKE_CUDA_ARCHITECTURES='"${_cuda_arch_vals}"
-
- cp -r "${pkgbase}-${pkgver}" "${pkgbase}-${pkgver}-cuda"
}
build() {
## ROOT
- mkdir -p "${srcdir}/build"
- cd "${srcdir}/build"
-
- cmake -C "${srcdir}/settings.cmake" \
- ${CUSTOM_CMAKE_FLAGS} \
- "${srcdir}/${pkgbase}-${pkgver}"
- make
+ cmake -B build -S ${pkgbase}-${pkgver} -G Ninja \
+ -C settings.cmake \
+ ${CUSTOM_CMAKE_FLAGS}
+ cmake --build build
## ROOT with CUDA
- mkdir -p "${srcdir}/build-cuda"
- cd "${srcdir}/build-cuda"
-
- cmake -C "${srcdir}/settings-cuda.cmake" \
+ cmake -B build-cuda -S ${pkgbase}-${pkgver} -G Ninja \
+ -C settings-cuda.cmake \
${CUSTOM_CMAKE_FLAGS} \
- ${CUSTOM_CUDA_ARCH} \
- "${srcdir}/${pkgbase}-${pkgver}-cuda"
- make
+ ${CUSTOM_CUDA_ARCH}
+ cmake --build build-cuda
}
_package() {
local bld_dir="${srcdir}/${1}"
cd "${bld_dir}"
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" cmake --install .
# fix missing hardlinks for genreflex and rootcint
cd "${pkgdir}"/usr/bin
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/root/-/commit/cde9c6a839cda083fea8911a23d88537cb94e878
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/root/-/commit/cde9c6a839cda083fea8911a23d88537cb94e878
You're receiving this email because of your account on gitlab.archlinux.org.
