diff options
| author | Tim Biermann <tbier@posteo.de> | 2021-06-15 21:22:43 +0000 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2021-06-15 21:22:43 +0000 |
| commit | 921a9dceef7814a1c8dc5620a257a002fe6ee86c (patch) | |
| tree | 86e132a1b50b3f32dfdd4a6ea7f234a0306d482d /cmake | |
| parent | e272914977a14ab7246c131735a3facaa0327bcf (diff) | |
| download | opt-921a9dceef7814a1c8dc5620a257a002fe6ee86c.tar.gz opt-921a9dceef7814a1c8dc5620a257a002fe6ee86c.tar.xz | |
cmake: 3.20.3 -> 3.20.4; added optional dependencies: jsoncpp librhash libuv lzlib nghttp2-libs ninja
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/.signature | 6 | ||||
| -rw-r--r-- | cmake/Pkgfile | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/cmake/.signature b/cmake/.signature index 4811fb6f9..0cb7a6ef8 100644 --- a/cmake/.signature +++ b/cmake/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VX2U54iias5iME+C5wFye90aXQT8hBEiC/USnWIjpxxw9TYxmk9RBGrabZFbRfVhpJ6hpjk+ur9rf6Il/R/cAk= -SHA256 (Pkgfile) = b92e01cb25ac731f85df5b43015a268142b69eeffb05d3d241873f2607c132c7 +RWSE3ohX2g5d/VNYhP3bqoQZ5K1BbF4HZyslJZ32vztWzXy4NOJsFHkTBwgh49e8Sxz6BLxZF1d0/UWkeH62OxOPB8+BbEmkSAM= +SHA256 (Pkgfile) = 056d8cf00efb567ae8277380c8b6f10a3d15fecad2a7cdec4ee12eef001174b6 SHA256 (.footprint) = 29404a5475dafed180921663c59ae5626397175d5e5e80519c82daa2307f4b8a -SHA256 (cmake-3.20.3.tar.gz) = 4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8 +SHA256 (cmake-3.20.4.tar.gz) = 87a4060298f2c6bb09d479de1400bc78195a5b55a65622a7dceeb3d1090a1b16 diff --git a/cmake/Pkgfile b/cmake/Pkgfile index 137cd1179..cd4cf7762 100644 --- a/cmake/Pkgfile +++ b/cmake/Pkgfile @@ -2,10 +2,10 @@ # URL: https://www.cmake.org/ # Maintainer: CRUX System Team, core-ports at crux dot nu # Depends on: curl libarchive expat ncurses -# Optional: python3-sphinx +# Optional: jsoncpp librhash libuv lzlib nghttp2-libs ninja python3-sphinx name=cmake -version=3.20.3 +version=3.20.4 release=1 source=(https://cmake.org/files/v${version%.*}/$name-$version.tar.gz) @@ -15,7 +15,14 @@ build() { sed -i Source/CMakeInstallDestinations.cmake \ -e 's|share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}|share/cmake|' - ./bootstrap \ + prt-get isinst ninja && PKGMK_CMAKE+=' --generator=Ninja' + prt-get isinst jsoncpp && PKGMK_CMAKE+=' --system-jsoncpp' || PKGMK_CMAKE+=' --no-system-jsoncpp' + prt-get isinst librhash && PKGMK_CMAKE+=' --system-librhash' || PKGMK_CMAKE+=' --no-system-librhash' + prt-get isinst libuv && PKGMK_CMAKE+=' --system-libuv' || PKGMK_CMAKE+=' --no-system-libuv' + prt-get isinst lzlib && PKGMK_CMAKE+=' --system-liblzma' || PKGMK_CMAKE+=' --no-system-liblzma' + prt-get isinst nghttp2-libs && PKGMK_CMAKE+=' --system-nghttp2' || PKGMK_CMAKE+=' --no-system-nghttp2' + + ./bootstrap $PKGMK_CMAKE \ --prefix=/usr \ --system-curl \ --system-expat \ @@ -23,12 +30,11 @@ build() { --system-bzip2 \ --system-libarchive \ --system-zstd \ - --no-system-librhash \ --parallel=${JOBS:-1} \ $(prt-get isinst python3-sphinx >/dev/null && echo --sphinx-man) - make - make DESTDIR=$PKG install + prt-get isinst ninja && ninja || make + prt-get isinst ninja && DESTDIR=$PKG ninja install || make DESTDIR=$PKG install rm -r $PKG/usr/{doc,share/cmake/Help} ln -sf $name $PKG/usr/share/$name-${version%.*} |