This makes ‘cmake-minimal’ accessible to users and additionally allows
for input rewriting, as discussed
at <https://issues.guix.gnu.org/65665#17>.
* gnu/packages/cmake.scm (cmake-minimal)[properties]: New field.
* gnu/packages/cmake.scm (cmake-minimal)[arguments]: When building natively on
the Hurd, add %common-disabled-tests/hurd to skipped tests in phase 'check'.
* gnu/packages/cmake.scm (%common-disabled-tests/hurd): New variable.
(cmake-bootstrap) [inputs]: Include libuv for the Hurd too.
[arguments]: Add %common-disabled-tests/hurd to #:make-flags for the Hurd.
Also add a 'patch-hurd' phase to fix the build.
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
* gnu/packages/cmake.scm (cmake): Update to 3.24.2.
[source]: Adjust snippet to preserve "Utilities/cmelf". Override with new
patch.
[native-inputs]: Use modify-inputs and remove labels.
* gnu/packages/patches/cmake-curl-certificates-3.24.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/cmake.scm (cmake-bootstrap)[native-search-paths]: Use the
$SSL_CERT_DIR/$SSL_CERT_FILE from (guix search-paths) instead of a local copy.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Fixes <https://issues.guix.gnu.org/50617>.
* gnu/packages/cmake.scm (%common-build-phases): Turn into a procedure
and adjust users. When 'target-x86-32?' returns true, add
'skip-cpack-txz-test'.
* gnu/packages/cmake.scm (%preserved-third-party-files): Repatriate from the
cmake package definition.
(cmake-bootstrap): Update to 3.19.2.
(cmake): Remove the version and source field overrides.
* gnu/packages/cmake.scm (cmake): Update to 3.19.0.
[source]: Modify inherited source to adjust the hash as well as the snippet so
that the "Utilities/cm3p" sub-directory is preserved.
[phases]{patch-bin-sh, check}: Temporarily overrides until the next rebuild
cycle.
These files are still available in the user-facing cmake package.
* gnu/packages/cmake.scm (cmake-minimal)[arguments]: Add phase to remove
help documentation.
* gnu/packages/cmake.scm (%common-build-phases): Remove phase
'use-system-libarchive'.
(%preserved-third-party-files): New variable.
(cmake-bootstrap)[native-inputs]: Remove.
[source](snippet): Rewrite in terms of FILE-SYSTEM-FOLD, and
preserve two files from the bundled libarchive.
(cmake-minimal)[source](snippet): Adjust accordingly.
This allows removing the bundled LibUV in a subsequent commit. This commit
alone makes no functional changes apart from the build system adjustments.
* gnu/packages/cmake.scm (%common-build-phases, %common-disabled-tests): New
variables.
(cmake-bootstrap)[arguments]: Refactor to use the shared phases and tests.
(cmake-minimal)[build-system]: Change to CMAKE-BUILD-SYSTEM.
[arguments]: Adjust accordingly.
(cmake)[arguments]: Likewise.
...and change the inheritance order while at it, to prepare for the next commit.
* gnu/packages/cmake.scm (cmake-minimal): Rename to ...
(cmake-bootstrap): ... this.
[name]: Set to "cmake-bootstrap".
[native-inputs]: Change from CURL to CURL-MINIMAL.
(cmake-minimal-bootstrap): Remove variable.
(cmake-minimal): New variable, inherits from CMAKE-BOOTSTRAP.
* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Change from
CMAKE-MINIMAL-BOOTSTRAP to CMAKE-BOOTSTRAP.
This is necessary to avoid a circular dependency in the next commit.
* gnu/packages/curl.scm (curl-minimal): New public variable.
* gnu/packages/cmake.scm (cmake-minimal-bootstrap): New public variable.
* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add #:cmake.
