[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
69/92: gnu: cmake-bootstrap: Fix build for the Hurd.
From: |
guix-commits |
Subject: |
69/92: gnu: cmake-bootstrap: Fix build for the Hurd. |
Date: |
Fri, 23 Jun 2023 12:45:45 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 16ef595bc06697698085fc23c4e5d8ea73f90e97
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 821b8808f7..9064ca3822 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.
@@ -136,6 +136,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.
@@ -190,7 +203,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.
@@ -210,20 +226,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 (target-hurd?)
- '()
- (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")
- 72/92: gnu: graphite2: Skip test on the Hurd., (continued)
- 72/92: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/06/23
- 74/92: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/06/23
- 24/92: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/23
- 45/92: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/06/23
- 48/92: gnu: python: Support native build on the Hurd., guix-commits, 2023/06/23
- 55/92: gnu: tcl: Remove failing tests on the Hurd.., guix-commits, 2023/06/23
- 58/92: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/06/23
- 59/92: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/06/23
- 60/92: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/06/23
- 64/92: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/06/23
- 69/92: gnu: cmake-bootstrap: Fix build for the Hurd.,
guix-commits <=
- 71/92: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/06/23
- 70/92: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/06/23
- 73/92: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/06/23
- 78/92: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/06/23
- 79/92: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/06/23
- 80/92: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/06/23
- 81/92: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/23
- 82/92: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/06/23
- 83/92: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/06/23
- 84/92: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/06/23