commit f05aa2f659037d50434c24609b9f395d81f30b1d Author: Tim Biermann <tbier@posteo.de> Date: Sun Jan 9 03:16:54 2022 +0100 cmake: use system libs diff --git a/cmake/.signature b/cmake/.signature index d9311f78..0a8521f8 100644 --- a/cmake/.signature +++ b/cmake/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqqos2b8x1Dhdq5P4QTRtRx10MTbkd2s0TMWY4CMVWCwyfdmQas8qQzadM5E3uaXSBWZs6kEJs+zQLgtp5WOn1AM= -SHA256 (Pkgfile) = c77714d7ae0a9942fbb47b047a4c4e5d31d8287cedb19de4a5e8ceb28e0c9fcb +RWRJc1FUaeVeqvzwbYpFDRUEcPnTCdFYzI2KuL/yaGWLK1xUSBYqmIxfRBAwyF/r/+YpAlnVdPdtVChHEUse10Lp2dr+iN6z8wU= +SHA256 (Pkgfile) = 188bbc6bd7f6620897f16e624b6d2202257ab8739e87ee6ee4fd971aab6da143 SHA256 (.footprint) = 77255f3e01e14136358d738d9a3284d8148fce7e9da0255057fb289ab3d672f9 SHA256 (cmake-3.22.1.tar.gz) = 0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0 diff --git a/cmake/Pkgfile b/cmake/Pkgfile index 038daa82..caf43927 100644 --- a/cmake/Pkgfile +++ b/cmake/Pkgfile @@ -1,8 +1,8 @@ # Description: A cross-platform, open-source make system # URL: https://www.cmake.org/ # Maintainer: CRUX System Team, core-ports at crux dot nu -# Depends on: curl expat libarchive ncurses ninja -# Optional: jsoncpp librhash libuv lzlib nghttp2-libs ninja python3-sphinx +# Depends on: curl expat jsoncpp libarchive libnghttp2 libuv lzlib ncurses rhash +# Optional:python3-sphinx name=cmake version=3.22.1 @@ -15,21 +15,10 @@ build() { sed -i Source/CMakeInstallDestinations.cmake \ -e 's|share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}|share/cmake|' - 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 \ + ./bootstrap --generator=Ninja \ --prefix=/usr \ - --system-curl \ - --system-expat \ - --system-zlib \ - --system-bzip2 \ - --system-libarchive \ - --system-zstd \ + --datadir=/share/cmake \ + --system-libs \ --parallel=${JOBS:-1} \ $(prt-get isinst python3-sphinx >/dev/null && echo --sphinx-man)