From patchwork Tue Jul 18 14:40:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51830 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7620927BBEB; Tue, 18 Jul 2023 15:45:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E1EF727BBE9 for ; Tue, 18 Jul 2023 15:45:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvm-0001W5-96; Tue, 18 Jul 2023 10:44:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLlut-0000ks-Ro for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:11 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qLlup-00017A-Oa for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlup-0006ka-LP for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 32/43] gnu: cmake-bootstrap: Fix build for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64711@debbugs.gnu.org Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969134725734 (code B ref 64711); Tue, 18 Jul 2023 14:43:03 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:27 +0000 Received: from localhost ([127.0.0.1]:53878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu9-0006gj-3g for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu6-0006fk-I3 for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:19 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLlu1-0000yg-AP; Tue, 18 Jul 2023 10:42:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=2JozEH5BmS4YziFyCzjWqxhlxDxmKFsJPXIMDUaC8t0=; b=DXaT+eBYxGXykccjBrGT Jrk59VLT8tbOxU6InZFGYPNwI05Y5g7IXlzPd/3gu7kFvWPRoEXDBYm4hcKuR1o7AJ3OmKrPyYS7J 3VuyrI6bWOiVicb7pgrFysPpp4xA+VKFiIBh0thkZKx65TzUcaixCfEYwHHYgan9e8GIul62QIO4/ GKUsePul17MSuomaXyrLy3aS1ozo3ML8DTDL9Q8z1oiA9gBK5yjwePJYWR388GJmTa4s/F3QQENDK mRqH7SepDEo5PdZd7UondIBMWfoP4w8ZlkkPWpaqKqg9GOaMMn7ylUXwQ9nMJRENpFciTFeunhrca HWA1ih8vx1D6ug==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1qLlu0-0004hp-UA; Tue, 18 Jul 2023 10:42:13 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:25 +0200 Message-Id: <5a941cef6cc90582dd786f29d3a5e057921b65c0.1689690897.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2019 Pierre-Moana Levesque -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -136,6 +136,19 @@ (define %common-disabled-tests ;; 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 @@ (define-public cmake-bootstrap "CTestTestSubdir" ; This test fails to build 2 of the 3 tests. ;; This test fails when ARGS (below) is in use, see ;; . - "CTestCoverageCollectGCOV"))) + "CTestCoverageCollectGCOV" + #$@(if (target-hurd?) + %common-disabled-tests/hurd + #~())))) (list (string-append ;; These arguments apply for the tests only. @@ -210,20 +226,17 @@ (define-public cmake-bootstrap ;; 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")