From e9623a7886c95af66a9999ef695efa5f57722f05 Mon Sep 17 00:00:00 2001 From: Alexander Hill Date: Sun, 30 Nov 2025 15:40:15 -0500 Subject: Fixed cmake --- STATUS.md | 2 +- sources/cmake/cmake.spec | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/STATUS.md b/STATUS.md index 69be58d..aa280ed 100644 --- a/STATUS.md +++ b/STATUS.md @@ -13,7 +13,7 @@ Definitions: | `byacc` | Yes | Yes | | `bzip2` | Yes | Yes | | `clang` | No | No | -| `cmake` | Yes | No | +| `cmake` | Yes | Yes | | `compiler-rt` | No | No | | `editline` | Yes | Yes | | `flex` | Yes | Yes | diff --git a/sources/cmake/cmake.spec b/sources/cmake/cmake.spec index 106bb91..5687bba 100644 --- a/sources/cmake/cmake.spec +++ b/sources/cmake/cmake.spec @@ -2,24 +2,25 @@ SRC_HASH="4104e94657d247c811cb29985405a360b78130b5d51e7f6daceb2447830bd579" SRC_NAME="cmake" SRC_URL="https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0.tar.gz" -SRC_VERSION="4.2.0" - -# TODO: Move executables from /usr/bin to $TT_BINDIR ~ahill -# TODO: Place all documentation under $TT_DATADIR/doc ~ahill +SRC_VERSION="4.2.0r1" build() { tar xf ../$SRC_FILENAME cd cmake-*/ - # NOTE: CMake's bootstrap script is strange because *everything* is located - # under the prefix, whether you like it or not. We're making use of - # /usr/bin this way, which is something I would like to avoid. ~ahill + # NOTE: CMake's bootstrap script is autoconf-like, but we shouldn't use + # TT_AUTOCONF_COMMON here because it would be incompatible. ~ahill ./bootstrap \ + --bindir=$TT_BINDIR \ + --datadir=$TT_DATADIR/cmake-$(echo $SRC_VERSION | cut -d"." -f1,2) \ + --docdir=$TT_DATADIR/doc/cmake-$(echo $SRC_VERSION | cut -d"." -f1,2) \ + --mandir=$TT_DATADIR/man \ --parallel=$TT_PROCS \ - --prefix=/usr \ + --prefix=$TT_PREFIX \ --system-bzip2 \ --system-libarchive \ --system-liblzma \ - --system-zlib + --system-zlib \ + --xdgdatadir=$TT_DATADIR make -O -j $TT_PROCS } -- cgit v1.2.3