[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
69/84: gnu: cmake-bootstrap: Fix build for the Hurd.
From: |
guix-commits |
Subject: |
69/84: gnu: cmake-bootstrap: Fix build for the Hurd. |
Date: |
Wed, 14 Jun 2023 06:24:01 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit a55dd258b7f35f39d3bca4be94c7ce4ed43d45b8
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon Jun 12 16:46:37 2023 +0200
gnu: cmake-bootstrap: Fix build for the Hurd.
* 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.
---
gnu/packages/cmake.scm | 43 ++++++++++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index bccb035854..b55d201b5f 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer
<maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
@@ -137,6 +137,19 @@ using the CMake build system.")
;; This test fails for unknown reason.
"RunCMake.file-GET_RUNTIME_DEPENDENCIES"))
+(define %common-disabled-tests/hurd
+ '("CTestTestTimeout"
+ "CTestTestRerunFailed"
+ "RunCMake.CompilerChange"
+ "RunCMake.ctest_test"
+ "RunCMake.file"
+ "RunCMake.BundleUtilities"
+ "RunCMake.configure_file"
+ "RunCMake.CTestTimeout"
+ "RunCMake.CTestTimeoutAfterMatch"
+ "RunCMake.CommandLine"
+ "RunCMake.CTestCommandLine"))
+
(define %preserved-third-party-files
'(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must
;; be available along with the required headers.
@@ -191,7 +204,10 @@ using the CMake build system.")
"CTestTestSubdir" ; This test fails to build 2 of the 3
tests.
;; This test fails when ARGS (below) is in use, see
;; <https://gitlab.kitware.com/cmake/cmake/issues/17165>.
- "CTestCoverageCollectGCOV")))
+ "CTestCoverageCollectGCOV"
+ #$@(if (target-hurd?)
+ %common-disabled-tests/hurd
+ #~()))))
(list
(string-append
;; These arguments apply for the tests only.
@@ -211,20 +227,17 @@ using the CMake build system.")
;; CMake uses its own configure script.
(replace 'configure
(lambda* (#:key (configure-flags '()) #:allow-other-keys)
- (apply invoke "./configure" configure-flags))))))
+ (apply invoke "./configure" configure-flags)))
+ #$@(if (target-hurd?)
+ #~((add-after 'unpack 'patch-hurd
+ (lambda _
+ ;; Version 3.25.0 has a similar fix.
+ (substitute* "Utilities/cmlibuv/src/unix/udp.c"
+ (("!defined\\(__QNX__\\)")
+ "!defined(__GNU__)")))))
+ #~()))))
(inputs
- (append
- (if (hurd-target?)
- '()
- (list libuv)) ;not supported on the Hurd
- (list bzip2
- curl
- expat
- file
- jsoncpp
- libarchive
- rhash
- zlib)))
+ (list libuv bzip2 curl expat file jsoncpp libarchive rhash zlib))
(native-search-paths
(list (search-path-specification
(variable "CMAKE_PREFIX_PATH")
- 18/84: gnu: parted: Support building for the Hurd., (continued)
- 18/84: gnu: parted: Support building for the Hurd., guix-commits, 2023/06/14
- 07/84: squash! gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/14
- 26/84: hurd-boot: Cater for netdde., guix-commits, 2023/06/14
- 31/84: gnu: commencement: Add automake-boot0., guix-commits, 2023/06/14
- 38/84: gnu: coreutils: Skip hanging and failing test for the Hurd., guix-commits, 2023/06/14
- 53/84: gnu: libgpg-error: Skip failing test for the Hurd., guix-commits, 2023/06/14
- 74/84: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/06/14
- 64/84: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/06/14
- 67/84: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/06/14
- 75/84: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/06/14
- 69/84: gnu: cmake-bootstrap: Fix build for the Hurd.,
guix-commits <=
- 08/84: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/06/14
- 06/84: squash! gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/14
- 05/84: gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/14
- 10/84: gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/14
- 16/84: gnu: Add rumpkernel., guix-commits, 2023/06/14
- 01/84: hurd-boot: Add urandom and default-pager translators., guix-commits, 2023/06/14
- 24/84: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/14
- 12/84: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/06/14
- 28/84: services: static-networking: Support netdde for the Hurd., guix-commits, 2023/06/14
- 09/84: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/06/14