From patchwork Tue Jul 18 14:39:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51793 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 43D4F27BBE9; Tue, 18 Jul 2023 15:41:26 +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=unavailable 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 BD99927BBE2 for ; Tue, 18 Jul 2023 15:41:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlsw-0006iT-NQ; Tue, 18 Jul 2023 10:41:06 -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 1qLlss-0006ZD-6H for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:02 -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 1qLlsr-0000Zq-TV for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlsr-0006WA-Qe for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 01/43] Revert "gnu: libunistring: Fix make check for the Hurd." Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:41:01 +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.168969124624969 (code B ref 64711); Tue, 18 Jul 2023 14:41:01 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:40:46 +0000 Received: from localhost ([127.0.0.1]:53711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsb-0006Uf-Sm for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsa-0006US-4Z for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:45 -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 1qLlsU-0000Wf-Jg; Tue, 18 Jul 2023 10:40:38 -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=SHe6XwkcXdmaoJVQMeoL/ieqLXely9f0zm1AelqeGC0=; b=DLS82/bAkUukHXBFC2Il n5kfm+T7IBiRQYXUISBpr3kC5xF+TveeKIeYVopAAUKpdJ8lUHcVE0A0Me5K0TuBbN8Zzk8by1DpH WYxt3WH7A349H1B32gUWWswmX5DQpf1LLf4pega7/ZJDUi9xmB9bG3UvsYDjhWZRIqVcjneoKwU2d evO3BlN1kaHJ4f8fknOJea/JTJ56686wK8tAvACk4I4EsG6T9/nF3teDrf7bywhdgpIdWMytfFEyW I9IfgRBTB1hgVucPhHsjpHE3KmlRELT2oTv6o7tsec2XjYLedpTCt5P6fiJBQLfzYhen5+IrBQNgu f97T6PIIAwE4ag==; 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 1qLlsU-0004hp-60; Tue, 18 Jul 2023 10:40:38 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:39:54 +0200 Message-Id: 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 This reverts commit 12e6a5923812abf180f03bea9e07dd99244a3fcd, which used XFAIL_TESTS to have 'make check' pass with failing tests "test-perror2" "test-strerror_r" that now pass with glibc-2.37 and libc-for-target in commencement. --- gnu/packages/libunistring.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index e68b7d2378..eccd053a35 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018, 2022 Efraim Flashner -;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -28,7 +28,6 @@ (define-module (gnu packages libunistring) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) - #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages base)) @@ -61,10 +60,7 @@ (define-public libunistring (with-directory-excursion (string-append #$output "/lib") (install-file "libunistring.a" (string-append #$output:static "/lib")) - (delete-file "libunistring.a"))))) - #:make-flags (if (target-hurd?) - #~(list "XFAIL_TESTS=test-perror2 test-strerror_r") - #~'()))) + (delete-file "libunistring.a"))))))) (synopsis "C library for manipulating Unicode strings") (description "GNU libunistring is a library providing functions to manipulate From patchwork Tue Jul 18 14:39:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51796 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 BC14A27BBEA; Tue, 18 Jul 2023 15:41:48 +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 34C5327BBE2 for ; Tue, 18 Jul 2023 15:41:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlsx-0006ka-2n; Tue, 18 Jul 2023 10:41:07 -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 1qLlss-0006b1-Hf for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:02 -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 1qLlss-0000a3-9L for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlss-0006WK-62 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 02/43] gnu: guile: Skip hanging and failing pipe tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:41:02 +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.168969124924987 (code B ref 64711); Tue, 18 Jul 2023 14:41:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:40:49 +0000 Received: from localhost ([127.0.0.1]:53715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsf-0006Ux-9s for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsd-0006UW-J0 for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:47 -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 1qLlsW-0000Ww-Qo; Tue, 18 Jul 2023 10:40:42 -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=r5uKUBmJn0ssPQS75PNriSoU4ZxOVPlWO331igslL7Y=; b=rxT7ikrrAIHgR3pqZFZi cdIfczGtFhRb8Q5qIkXJrpXzu7ezgCXM5+uLZ3+4JEDbLqXAEptF8MhV8OsiAnhnnjVhuyxXOoXgf 8ZEuqgsu5wMlU5Ken/VFogrlviGUu1xUOtCoPZs5IL7CemvYcBo36dnOwLw3EwjetX5mFRh/FmonO lpTURudtY3hCS9sQJIx6XL4eE0XjLi9G8YkudW+DoLOZdMOIUOZmtiDR0c2vhSBmxy5lS/P2CY57w oTSz9VI1sWseA+o9/WO8xPWpIBrdSik8htR6XWvQ4HnwAi1rpWBX46RKJ0iO0a9iajwV9DDn+on+e jCQQrYCGYMB6lA==; 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 1qLlsV-0004hp-3J; Tue, 18 Jul 2023 10:40:39 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:39:55 +0200 Message-Id: <86a9ff0068ac21d4fa340f450f0835fa840111b2.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/guile.scm (guile-3.0)[arguments]: When building on the Hurd, add stage 'disable-popen.test-open-pipe' to avoid running the open-input-pipe test (hangs) and open-output-pipe test (fails. --- gnu/packages/guile.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 48bee600a9..ed20c1dfbc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -378,6 +378,15 @@ (define-public guile-3.0 (search-patch "guile-hurd-posix-spawn.patch"))) (invoke "patch" "--force" "-p1" "-i" patch)))) #~()) + #$@(if (system-hurd?) + #~((add-after 'unpack 'disable-popen.test-no-duplicate + ;; This test hangs on the Hurd. + (lambda _ + (substitute* "test-suite/tests/popen.test" + (("\\(pass-if \"no duplicate\".*" all) + (string-append all " (when (string-ci= \"GNU\" (vector-ref (uname) 0)) (throw 'unresolved)) +")))))) + #~()) #$@(if (target-ppc32?) #~((add-after 'unpack 'adjust-bootstrap-flags (lambda _ From patchwork Tue Jul 18 14:39:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51797 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 CB7DB27BBE2; Tue, 18 Jul 2023 15:41:51 +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=unavailable 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 06A1F27BBE9 for ; Tue, 18 Jul 2023 15:41:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltR-000734-LZ; Tue, 18 Jul 2023 10:41:38 -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 1qLlsv-0006iQ-0a for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:06 -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 1qLlst-0000an-Rx for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlst-0006Wu-Ow for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 03/43] gnu: coreutils: Skip hanging and failing test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:41: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.168969126325085 (code B ref 64711); Tue, 18 Jul 2023 14:41:03 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:03 +0000 Received: from localhost ([127.0.0.1]:53729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsp-0006Vm-DM for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsj-0006Uu-5S for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:56 -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 1qLlsY-0000X7-IB; Tue, 18 Jul 2023 10:40:47 -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=GLvunAsLvEYkScm/lgz+A+tjh2OM0xs+5SREORMwtNY=; b=JWHAPz4p95gzRTTmwYH7 jOwiKueM5C2OEeA5JlJVPatvZusdKrpdrBd3iSsc1q1aGIQ4agRpzMeviBII0Juc2GzFluTXsB1O0 O/QeLSIFspVNijU5Sm6qsXBc0aCKSVgE//4dsOwb+O8bI/0xtDvggUkL9wMYHPz62YhzRX20w1sU0 ngdEXxek9cetB3+aLh/DQVURx5MvQKlC3wvBjTPnNtpD6hxwTG6nO+hKiSUC2J1O8CNEuAWZKlkjx yQmbOOczZBHpVlHnihEEG6w5Dv+PnYaxHr9C+iwj0giV/h8rGM8BpFFTIiorySQcSDbP9MlGF8ITp ml1sVJ7/dSJNrg==; 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 1qLlsX-0004hp-5E; Tue, 18 Jul 2023 10:40:42 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:39:56 +0200 Message-Id: <53cd3ef833e0f894e620f8e3a43cdbe6e1f6f62b.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/base.scm (coreutils)[arguments]: When building natively on the Hurd, remove "test/df/unreadable.sh" and "test-perror2" from #:make-flags's XFAIL_TESTS as they now pass. Move failing script tests from XFAIL_TESTS to 'remove-tests' phase. In phase 'remove-tests' rewrite substitute* to skip tests instead of removing them. Add hanging and failing tests. --- gnu/packages/base.scm | 47 ++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 55fe70309c..e941853d20 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -397,23 +397,13 @@ (define-public coreutils (outputs '("out" "debug")) (arguments `(#:parallel-build? #f ; help2man may be called too early - ,@(if (target-hurd?) + ,@(if (system-hurd?) '(#:make-flags ; these tests fail deterministically - (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl" - " tests/misc/kill.sh" - " tests/misc/nice.sh" - " tests/misc/pwd-long.sh" - " tests/split/fail.sh" - - ;; /hurd/fifo issue: - ;; . - " tests/df/unreadable.sh" - + (list (string-append "XFAIL_TESTS=" ;; Gnulib tests. " test-fdutimensat" " test-futimens" " test-linkat" - " test-perror2" " test-renameat" " test-renameatu" " test-utimensat"))) @@ -435,10 +425,35 @@ (define-public coreutils (("#!/bin/sh") (string-append "#!" (which "sh")))))) (add-after 'unpack 'remove-tests (lambda _ - ,@(if (target-hurd?) - '((substitute* "Makefile.in" - ;; this test hangs - (("^ *tests/misc/timeout-group.sh.*") "")) + ,@(if (system-hurd?) + '((substitute* + ;; These tests hang + '("tests/cp/sparse-to-pipe.sh" + "tests/split/fail.sh" + ;; These tests error + "tests/dd/nocache.sh" + ;; These tests fail + "tests/cp/sparse.sh" + "tests/cp/special-f.sh" + "tests/dd/bytes.sh" + "tests/dd/stats.sh" + "tests/ls/dangle.sh" + "tests/ls/follow-slink.sh" + "tests/ls/hyperlink.sh" + "tests/ls/infloop.sh" + "tests/ls/inode.sh" + "tests/ls/selinux-segfault.sh" + "tests/misc/env-S.pl" + "tests/misc/factor-parallel.sh" + "tests/misc/ls-misc.pl" + "tests/misc/nice.sh" + "tests/misc/pwd-long.sh" + "tests/misc/shred-passes.sh" + "tests/misc/stat-slash.sh" + "tests/rm/fail-eperm.xpl" + "tests/split/filter.sh") + (("^#!.*" all) + (string-append all "exit 77;\n"))) (substitute* "gnulib-tests/Makefile.in" ;; This test sometimes fails and sometimes ;; passes, but it does this consistently, so From patchwork Tue Jul 18 14:39:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51794 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 6E39C27BBE9; Tue, 18 Jul 2023 15:41:29 +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=unavailable 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 40DD227BBE2 for ; Tue, 18 Jul 2023 15:41:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlt0-0006ob-SQ; Tue, 18 Jul 2023 10:41:10 -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 1qLlss-0006cW-TP for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:04 -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 1qLlss-0000aF-L2 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlss-0006WR-Ha for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 04/43] gnu: grep: Update hanging and failing tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:41:02 +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.168969125725021 (code B ref 64711); Tue, 18 Jul 2023 14:41:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:40:57 +0000 Received: from localhost ([127.0.0.1]:53723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsm-0006VR-MC for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsj-0006Ut-5O for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:55 -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 1qLlsa-0000XC-Cr; Tue, 18 Jul 2023 10:40:47 -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=cbdlCtkCzLxi4FBO6Twh6qr0mbpWPENwQ5iHS+jrNrw=; b=m6VnQvDFG0iX6xS9Ijfz AeDuozbrqUd9BL2NeWCMm0zjcEsXhxxbsDtraZOpot2oBT0kE0Cguh/oILyYHG6rhC9OCNBcn0duo e7PfI0jPv2mcgQ88xMikqafma9ujhA6JG0Z0zP9lbKefqHf1IHCliVtHm1ifDDCfaLRoMUTwqxSR3 FH2aaHpd9YRbYXdVSk8wfJQi8Au6/gZu+tin9vZk9WtAsFxbIQaXab7UKDtH9OFqQmuiSeNQkdDYK 8zy5CgGy1kLs7/FWlO5fiauT6obIVFpoFy8lY9x7zowNyz4fggt+AJofy2co/x1hmzBxkRjeOstXR JAKc/5SdxVTLRg==; 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 1qLlsZ-0004hp-0y; Tue, 18 Jul 2023 10:40:43 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:39:57 +0200 Message-Id: <30ff4538c1f67249b2720dcef60877b9a7cab7ad.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/base.scm (grep)[arguments]: When building natively on the Hurd, remove Rename phase 'skip-triple-backref-test' to 'skip-tests'. Remove "tests/triple-backref" as it now passes. Add the hanging "tests/hash-collision-perf" test, and the failing "tests/file" test. --- gnu/packages/base.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e941853d20..f1b027b0dc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -134,21 +134,17 @@ (define-public grep (string-append bin "/fgrep")) (("^exec grep") (string-append "exec " bin "/grep")))))) - ,@(if (target-hurd?) - '((add-before 'check 'skip-triple-backref-test + ,@(if (system-hurd?) + '((add-before 'check 'skip-test (lambda _ - ;; This test is marked as malfunctioning on glibc systems - ;; due to - ;; - ;; and it triggers a segfault with glibc 2.33 on GNU/Hurd. - ;; Skip it. - (substitute* "tests/triple-backref" - (("^warn_" all) - (string-append "exit 77\n" all)))))) - '())) - #:make-flags ,(if (target-hurd?) - ''("XFAIL_TESTS=test-perror2 equiv-classes") ;XXX - ''()))) + (substitute* + ;; This test hangs + '("tests/hash-collision-perf" + ;; This test fails + "tests/file") + (("^#!.*" all) + (string-append all "exit 77;\n")))))) + '())))) (synopsis "Print lines matching a pattern") (description "grep is a tool for finding text inside files. Text is found by From patchwork Tue Jul 18 14:39:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51795 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 160A127BBEA; Tue, 18 Jul 2023 15:41:37 +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 4A49B27BBE2 for ; Tue, 18 Jul 2023 15:41:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlt1-0006qD-0N; Tue, 18 Jul 2023 10:41:11 -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 1qLlsv-0006iO-0M for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:06 -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 1qLlst-0000ag-FD for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlst-0006Wn-BF for guix-patches@gnu.org; Tue, 18 Jul 2023 10:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 05/43] Revert "gnu: sed: Skip failing test on GNU/Hurd." Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:41: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.168969125925037 (code B ref 64711); Tue, 18 Jul 2023 14:41:03 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:40:59 +0000 Received: from localhost ([127.0.0.1]:53727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsp-0006Vj-3H for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsj-0006Uv-5z for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:55 -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 1qLlsd-0000XL-Fp; Tue, 18 Jul 2023 10:40:47 -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=DF07RpHEVen7AKN/4Iur5bDwMCslfxZUEfRuw7xVzg0=; b=hUNEmSZOcKG8kNALzYiZ gCCnCIhdo/UpEtrkOVsgnkwqiFc+xzKIBFZyS+QrZlCLrXLqaT6q7ItuzR1qXeuwvj/Odt9gVJRQA xgE2ZSg2d9/m194tIy2CkSl78jXHr3ITr7E230V8pbBtU+bq5HGfkivvPtIzWTnRxrVOMnwwsN8pr CIM0VZCG8uJwlQVUr1tT0aTFgr2yd5XOUa7yK7UOQM5aw4wdX/bTeLz57ZBjaJU4GxBSCdgpUfYBT AYNqOwr3gR/c+hcTruULalZSCs9b7tlrG/8LIUf/0OXU4IIP/IjdR4Xv8JjPmpmn5wJEegI1eav78 vo8W19+dyb61uA==; 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 1qLlsb-0004hp-Da; Tue, 18 Jul 2023 10:40:46 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:39:58 +0200 Message-Id: <109423da130ff371f106cfb758846d6632bf2426.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 This reverts commit 779757047997d315d899b40c199be3709115cce4, as the gnulib "tests-perror2" test now passes. --- gnu/packages/base.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f1b027b0dc..00e59e6f46 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -183,10 +183,6 @@ (define-public sed " CONFIG_HEADER='$(CONFIG_HEADER)'\t\t\\\n"))))) (modules '((guix build utils))))) (build-system gnu-build-system) - (arguments - `(#:make-flags ,(if (target-hurd?) - ''("XFAIL_TESTS=test-perror2") - ''()))) (synopsis "Stream editor") (native-inputs (list perl)) ;for tests (description From patchwork Tue Jul 18 14:39:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51800 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 862DD27BBEA; Tue, 18 Jul 2023 15:42:37 +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 E3B2A27BBE2 for ; Tue, 18 Jul 2023 15:42:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltr-0007Wh-9h; Tue, 18 Jul 2023 10:42:03 -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 1qLltq-0007WN-MR for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -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 1qLltq-0000tm-6n for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltq-0006cd-3U for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 06/43] gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:02 +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.168969127025155 (code B ref 64711); Tue, 18 Jul 2023 14:42:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:10 +0000 Received: from localhost ([127.0.0.1]:53736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlss-0006We-W6 for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlso-0006VB-O1 for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:40:59 -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 1qLlsi-0000YD-QH; Tue, 18 Jul 2023 10:40:53 -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=bXwnusM9HJSfhxJDqo6hBlA7eThjgFMDtZtvN3xAmh4=; b=e+n+krr84AfFhH1aXjYg I4NAJTsL60hixZ2m1khDqlAW5FDKDU/3IyNeSgFrP+ciahRY21qq/lwiC8Jc1S2wN/tnDVmgKHknL siBcfc9nBh6UhoQhcovXWQkhTwwPKJgAQ9DszDUNYGpMnAaE0enXkslRXat9YV66aqyf4prFce4Il Mt43B3o+OOpRnCqBP41681oqBWzMGryWRd+KkbjdG+cKShCLW/9b77dFwAAthUY2uuhiHo0w/rln0 sLJr1tC+ZN6rwXlasn7qW0V7i7GhjRm3EnAUx4RI6c2LqIPtjHX5JqVmyuxaTR3oOb+djzuEE0eJ1 QDKD9YhzDaEQMA==; 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 1qLlsd-0004hp-Vh; Tue, 18 Jul 2023 10:40:49 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:39:59 +0200 Message-Id: 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/base.scm (findutils)[arguments]: When building natively on the Hurd, remove #:make-flags as "test-strerror_r" fails non-deterministically. Instead, add 'skip-test' phase and skip it. --- gnu/packages/base.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 00e59e6f46..14479c4951 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -340,10 +340,16 @@ (define-public findutils (substitute* '("tests/xargs/verbose-quote.sh" "tests/find/exec-plus-last-file.sh") (("#!/bin/sh") - (string-append "#!" (which "sh"))))))) - #:make-flags ,(if (target-hurd?) - ''("XFAIL_TESTS=test-strerror_r") - ''()))) + (string-append "#!" (which "sh")))))) + ,@(if (system-hurd?) + '((add-after 'unpack 'skip-tests + (lambda _ + (substitute* + ;; This test fails non-deterministically + "gnulib-tests/test-strerror_r.c" + (("(^| )main *\\(.*" all) + (string-append all "{\n exit (77);//")))))) + '())))) (synopsis "Operating on files matching given criteria") (description "Findutils supplies the basic file directory searching utilities of the From patchwork Tue Jul 18 14:40:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51802 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 5005627BBE9; Tue, 18 Jul 2023 15:42:49 +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=unavailable 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 E01D427BBE2 for ; Tue, 18 Jul 2023 15:42:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltr-0007Ww-R0; Tue, 18 Jul 2023 10:42:04 -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 1qLltq-0007WS-SA for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -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 1qLltq-0000ts-KF for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltq-0006ck-Gc for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 07/43] gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:02 +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.168969127125169 (code B ref 64711); Tue, 18 Jul 2023 14:42:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:11 +0000 Received: from localhost ([127.0.0.1]:53750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt0-0006Xl-RI for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlss-0006Vc-Ea for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:02 -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 1qLlsm-0000Yr-Pv; Tue, 18 Jul 2023 10:40:57 -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=2irxo8WYMTUokOdx6+OD/VJ/hnitMYydqHMpkDneUOs=; b=j7CRoYmJRNFLur4sTzVR rbRUgEN/B1b44W3wTukTUGXAyq+cuaADLdzfVzpMYbl3rZlSujmHyqDJ/LPZWd0XtLl25ywRVYz9Z EnAo0qB9Ks0Fs1UowpuugK/7L/bIzt7f7VAG22/lzI8/GqJiRmlPZoVozbW0XpU7n+9/4u6QFNvOu 3M1T/gdyyEDiRfUngXaJQtRJdx4ePSch422zu9Y7kg208F83TxIHLXid8QlzYRKz7dOYZdWWnKfrH 6r6pydGL00QPAXFfIQgXw4YWwLfQtCKBn9GkRJjV06MKJIjMt85/eMnpRjmzpQpV1pzJ71uaycKYT 7Ym7Gm4mJwUhwg==; 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 1qLlsi-0004hp-7s; Tue, 18 Jul 2023 10:40:54 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:00 +0200 Message-Id: <02a949b8a5db06eb0d5a521cc7e6f09e75f1464b.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/base.scm (diffutils)[arguments]: When building natively on the Hurd, Move "large-subopt" test from #:make-flags' XFAIL_TESTS to a new 'skip-tests' phase. Remove #:make-flags for the Hurd, as "test-perror2" now passes. --- gnu/packages/base.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 14479c4951..1fdfaf8a57 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -303,9 +303,15 @@ (define-public diffutils (patches (search-patches "diffutils-fix-signal-processing.patch")))) (build-system gnu-build-system) (arguments - `(#:make-flags ,(if (target-hurd?) - ''("XFAIL_TESTS=test-perror2 large-subopt") - ''()))) + (list + #:phases (if (system-hurd?) + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-tests + (lambda _ + (substitute* "tests/large-subopt" + (("^#!.*" all) + (string-append all "exit 77;\n")))))) + #~%standard-phases))) (native-inputs (list perl)) (synopsis "Comparing and merging files") (description From patchwork Tue Jul 18 14:40:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51811 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 785CA27BBEA; Tue, 18 Jul 2023 15:43:49 +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 F22D327BBE2 for ; Tue, 18 Jul 2023 15:43:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltu-0007Xd-0L; Tue, 18 Jul 2023 10:42:06 -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 1qLltr-0007Wf-6x for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:03 -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 1qLltq-0000u1-VM for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltq-0006cr-SJ for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 08/43] gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:02 +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.168969127225175 (code B ref 64711); Tue, 18 Jul 2023 14:42:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:12 +0000 Received: from localhost ([127.0.0.1]:53752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt1-0006Xu-ER for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsu-0006Vs-HU for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:04 -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 1qLlsp-0000ZB-9U; Tue, 18 Jul 2023 10:40:59 -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=QhT/TRXhsbZ4FIioZeAaTt+uEnMX+ixxZ0288D57p74=; b=Ve4McctkjWvaFctrfuz/ LeemoE+Upq3szxSr1K8/iiFJAQBKPY2747Qxe1YdCTxt7nZTO0w7mpmI31vw6/nfZGJgBXe/P9iM5 kPPGXcpCT7Q/dUcuzIzpFNs1jdqsGIcGMUnsOtXSIVJl8UflJV3v03CsOk6CU4gb3WD0j/jFakHm5 DauYbnSqE1NW3JALpPsODQfG0b9OH0h2JXPPBZx+cOw03vpg6uygOX3NsezKVlDd09uE+wrFJDoB5 SvjAM2ZTg71LzByGaQQbdjOk19uvSzwTduT5n9L4ImMvLCQU2R9nK8p3vNY9x2Il+vm1yAzstJUms TuL+LLvvq22ZuA==; 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 1qLlsn-0004hp-CF; Tue, 18 Jul 2023 10:40:58 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:01 +0200 Message-Id: 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/gettext.scm (gettext-minimal)[arguments]: When building for the Hurd, remove XTESTS_FAIL from, as "test-perror2" now passes. --- gnu/packages/gettext.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 114d8cf7af..0cb01154d3 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -133,10 +133,7 @@ (define-public gettext-minimal #t))))) ;; When tests fail, we want to know the details. - #:make-flags #~'("VERBOSE=yes" - #$@(if (target-hurd?) - '("XFAIL_TESTS=test-perror2") - '())))) + #:make-flags #~'("VERBOSE=yes"))) (home-page "https://www.gnu.org/software/gettext/") (synopsis "Tools and documentation for translation (used to build other packages)") From patchwork Tue Jul 18 14:40:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51806 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 E15E627BBE2; Tue, 18 Jul 2023 15:43:09 +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 3742E27BBEA for ; Tue, 18 Jul 2023 15:43:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltu-0007aI-8g; Tue, 18 Jul 2023 10:42:06 -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 1qLltr-0007Wo-Ip for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:03 -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 1qLltr-0000u8-Av for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltr-0006cz-7t for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 09/43] gnu: m4: Skip gnulib stack-overflow tests for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42: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.168969127325198 (code B ref 64711); Tue, 18 Jul 2023 14:42:03 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:13 +0000 Received: from localhost ([127.0.0.1]:53758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt1-0006Y5-Vm for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsv-0006Vu-KM for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:06 -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 1qLlsq-0000ZK-DV; Tue, 18 Jul 2023 10:41:00 -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=KtY79YRkQXjbuLGQBqywHm2APlQ48JUA4aPnrSdfJ6s=; b=cDq02OWt9EzAvhJyzZyR WcZY8DwuvuBs8Lw6G8qMzWaUv0QnNuDEuwcL5KsUPaZziLVhEu6LJTNmJ8qXI2Buo8dh4hP5KBp8n EsHdv/Fu1wC2B8drRXLMUmmwb3OYNnVTkL1pDgNhg+doRoexmsBbl9BYOWt27nxAerdZF68FLJH1v 2DUnczoaRCNMQa09R284VhjqORN+1y0TlJRB/tZV6MJ81LTup7C3KPODPXFtY4WvOVazIR097rKlK r1sZM1IKUIDokhm1dLoYZRDwM6shzQPUvtk/y4jqe2z0fCdYsoLO2pnzhUGBaLv0IQ8bPLmAH3SHr uN0XC/vOwnVyyg==; 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 1qLlsp-0004hp-VX; Tue, 18 Jul 2023 10:41:00 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:02 +0200 Message-Id: <9db574983a7ebe9cf45773c7e68853c835fb83b8.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/m4.scm (m4)[arguments]: When building for the Hurd, add stage 'skip-stack-overflow-tests'. --- gnu/packages/m4.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm index fbc075a2cb..39b50b6800 100644 --- a/gnu/packages/m4.scm +++ b/gnu/packages/m4.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2022 Marius Bakke +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,7 +24,8 @@ (define-module (gnu packages m4) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix utils)) (define-public m4 (package @@ -54,6 +56,14 @@ (define-public m4 (substitute* "tests/test-execute.sh" (("4 5 6") "4 6")))) + ,@(if (target-hurd?) + '((add-after 'unpack 'skip-stack-overflow-tests + (lambda _ + (substitute* '("tests/test-sigsegv-catch-stackoverflow1.c" + "tests/test-sigsegv-catch-stackoverflow2.c") + (("(^| )main *\\(.*" all) + (string-append all "{\n exit (77);//")))))) + '()) (add-after 'unpack 'configure-shell (lambda* (#:key native-inputs inputs #:allow-other-keys) (let ((/bin/sh (search-input-file (or native-inputs inputs) From patchwork Tue Jul 18 14:40:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51813 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 7697427BBEC; Tue, 18 Jul 2023 15:43:59 +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 A901627BBEC for ; Tue, 18 Jul 2023 15:43:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltu-0007cN-Qv; Tue, 18 Jul 2023 10:42:07 -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 1qLlts-0007XT-UV for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -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 1qLltr-0000uE-Ml for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltr-0006d6-JH for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 10/43] gnu: openssl: Build fix for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42: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.168969127325205 (code B ref 64711); Tue, 18 Jul 2023 14:42:03 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:13 +0000 Received: from localhost ([127.0.0.1]:53762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt3-0006YN-4i for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsw-0006WC-RP for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:07 -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 1qLlsr-0000Zg-KE; Tue, 18 Jul 2023 10:41:01 -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=9ugelFqn3WO38lhx1dI9VynZ3NbdKKh6ms8bbDVmkk4=; b=Q4Yv4D1epuyfRsxOH9c5 jAQCbw2UOCcjyF55+D0hq4bl55XtuGURuLuaRLstNjN7IhCCstlVM5h5gWtXnmAaD3pHrB+w4M8D3 xnWcgdmisUjvjNAC2Vz4C0uP9GjM6sBo/kujQmnBE8n6HCfoS8AGYww/8mOmcrHCyFu18gWwyIIH/ a9dIGMUpD6uBiRPrdQx52HdKfUiMnyI4BL5GcxTrgjZFJYnH76znpBoSKpG9bEA9CZFdKDJqbKKbt kBalICYSD3rSzBbAUjZtemoJ+czY+vONvWnXCv1pqEd0sk4wIVdBdFKWdWExgVX4Mqj8mGW3DgDGI LNwfWWahqSYYUQ==; 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 1qLlsq-0004hp-TS; Tue, 18 Jul 2023 10:41:01 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:03 +0200 Message-Id: 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/tls.scm (openssl-3.0)[arguments]: When building on the Hurd, add "hurd-x86" to #:configure-flags. --- gnu/packages/tls.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d94b7c27f5..e8ed0d61a4 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -585,7 +585,13 @@ (define-public openssl-3.0 (lambda* (#:key native-inputs inputs #:allow-other-keys) (setenv "HASHBANGPERL" (search-input-file (or native-inputs inputs) - "/bin/perl")))))))) + "/bin/perl")))))) + ((#:configure-flags flags #~'()) + (if (target-hurd? (%current-system)) + #~(append + #$flags + '("hurd-x86")) + flags)))) (license license:asl2.0))) (define-public openssl openssl-3.0) From patchwork Tue Jul 18 14:40:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51799 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 43BA927BBEA; Tue, 18 Jul 2023 15:42:34 +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 9275627BBE2 for ; Tue, 18 Jul 2023 15:42:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltz-0007kS-Ld; Tue, 18 Jul 2023 10:42:11 -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 1qLlty-0007iR-DG for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -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 1qLlty-0000wC-4z for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltr-0006dD-Vp; Tue, 18 Jul 2023 10:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 11/43] gnu: python: Support native build on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42: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 Cc: Lars-Dominik Braun , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , jgart Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969127425217 (code B ref 64711); Tue, 18 Jul 2023 14:42:03 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:14 +0000 Received: from localhost ([127.0.0.1]:53764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt3-0006YU-KK for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsx-0006WX-Rf for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:08 -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 1qLlss-0000aE-Jm; Tue, 18 Jul 2023 10:41:02 -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=hURunyqjLTI9mjoAGaongX3G37onxKsAfOeXLRx2nCM=; b=P7Gr7Jdwd+fcjMEablMv LwZbHIC7tARffG99/B76VJRO6CsyJezRLzNbDd17YCAyQSqcjZfaqJ2bIDa6WZ5FSbBXwZxOjt0tx 7EY3wYB4ndT7clMQ7QZFT1lAthYQtWCcP5E8JgIIm0woCMQQFFqKK5W4+HV7ubuzK4u4ad1O1PHtf KafL/FKoFEpVbU7jS0XJ4Kkc8GGSka1qV6F8Qtona9hv7ENXkvjXwFQVTxosC+Y4e/d9j4g5o2IHB oz+xK9LT7Gykuz2kYdsPTbq8FfHejO+oN73aQhaDpxpAnTjTb78P7FhV85U3UW0IiFkQRP7UyIFaL aXe8doUOuxh5YQ==; 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 1qLlss-0004hp-5x; Tue, 18 Jul 2023 10:41:02 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:04 +0200 Message-Id: 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 Running "test_concurrent_futures" and "test_venv" freeze the Hurd. Tests "test_multiprocessing_forkserver" and "test_multiprocessing_spawn" run over 10mins. Debian simply skips all tests on the Hurd. * gnu/packages/python.scm (python-3.10)[arguments]: When building for the Hurd, add hanging and failing to #:make-flags's --exclude flag. Also, add 'disable-multi-processing' phase to avoid compileall.py hang during install. --- gnu/packages/python.scm | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 302f995b0f..51d5f598d7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -457,7 +457,7 @@ (define-public python-3.10 (format #f "TESTOPTS=-j~d" (parallel-job-count)) ;; test_mmap fails on low-memory systems " --exclude test_mmap test_socket" - ,@(if (target-hurd?) + ,@(if (system-hurd?) '(" test_posix" ;multiple errors " test_time" " test_pty" @@ -487,12 +487,33 @@ (define-public python-3.10 " test_open_unix_connection" " test_open_unix_connection_error" " test_read_pty_output" - " test_write_pty") + " test_write_pty" + " test_concurrent_futures" ;freeze + " test_venv" ;freeze + " test_multiprocessing_forkserver" ;runs over 10min + " test_multiprocessing_spawn" ;runs over 10min + " test_builtin" + " test_capi" + " test_dbm_ndbm" + " test_exceptions" + " test_faulthandler" + " test_getopt" + " test_importlib" + " test_json" + " test_multiprocessing_fork" + " test_multiprocessing_main_handling" + " test_pdb " + " test_regrtest" + " test_sqlite") '())))) ((#:phases phases) `(modify-phases ,phases ,@(if (system-hurd?) - `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9 + `((delete 'patch-regen-for-hurd) ;regen was removed after 3.5.9 + (add-after 'unpack 'disable-multi-processing + (lambda _ + (substitute* "Makefile.pre.in" + (("-j0") "-j1"))))) '()) (add-after 'unpack 'remove-windows-binaries (lambda _ From patchwork Tue Jul 18 14:40:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51826 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 F2D3627BBE9; Tue, 18 Jul 2023 15:44:34 +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=unavailable 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 CB2A727BBE2 for ; Tue, 18 Jul 2023 15:44:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltx-0007fS-0M; Tue, 18 Jul 2023 10:42:09 -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 1qLltt-0007Xb-9Z for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -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 1qLlts-0000uO-GE for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlts-0006dK-Cl for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 12/43] gnu: mpfr: Skip failing test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:04 +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.168969127425226 (code B ref 64711); Tue, 18 Jul 2023 14:42:04 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:14 +0000 Received: from localhost ([127.0.0.1]:53766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt4-0006Yg-3Y for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlsz-0006XH-VW for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:10 -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 1qLlst-0000ak-LU; Tue, 18 Jul 2023 10:41:04 -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=oNCxIKA9AFtWi2NUJJL9Mizvzi3ws3K+tQmM+6p3c+s=; b=XSQatk6moNVvJxB2kHb1 N1IR2U40VXUqHGtBPPRAvGRfylyRulHCd7UzNLaWYJIR23GkwEwv3SmqvFbNZIMbKIQrLaBKo0bbS NQLF9o/pPjpsLSHdSGWedb9mlLwksLFeLvFxG50ljzk3xzPy0c4kCe9LG/6ch00dIrQ17w28Uk6QM wdLdKVFtOzXZkQGZCkGqH6jrTQ3Exink5YfjaAWskF3xnqjmd6weenth5d1KuYNlpWaFQ0Mh0QHIc dcEQwFlOaVIzCEbo2kmXSkj4bGFHa8PWNh9fFmmvyniLRgQ8ivOzIYZl/srMcGp0kRzEQz0uKzeg+ mg/xEePg7ZMKrw==; 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 1qLlst-0004hp-1U; Tue, 18 Jul 2023 10:41:03 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:05 +0200 Message-Id: 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/multiprecision.scm (mpfr)[arguments]: When building natively on the Hurd, add 'skip-tests' phase to skip "tsprintf". --- gnu/packages/multiprecision.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 51ba21162c..3aa5dccfab 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018, 2019, 2021, 2023 Efraim Flashner ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -126,6 +127,17 @@ (define-public mpfr ".tar.xz")) (sha256 (base32 "14yr4sf4mys64nzbgnd997l6l4n8l9vsjnnvnb0lh4jh2ggpi8q6")))) + (arguments + (list + #:phases (if (system-hurd?) + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-tests + (lambda _ + (substitute* + "tests/tsprintf.c" + (("(^| )main *\\(.*" all) + (string-append all "{\n exit (77);//")))))) + #~%standard-phases))) (build-system gnu-build-system) (outputs '("out" "debug")) (propagated-inputs (list gmp)) ; refers to From patchwork Tue Jul 18 14:40:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51819 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 5748927BBEB; Tue, 18 Jul 2023 15:44:07 +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=unavailable 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 6BE6027BBEA for ; Tue, 18 Jul 2023 15:43:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlty-0007gy-1V; Tue, 18 Jul 2023 10:42:10 -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 1qLltt-0007Xg-WE for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -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 1qLltt-0000ug-D0 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltt-0006dY-9v for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 13/43] gnu: elfutils: Skip failing tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:05 +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.168969127525246 (code B ref 64711); Tue, 18 Jul 2023 14:42:05 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:15 +0000 Received: from localhost ([127.0.0.1]:53772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt5-0006Yw-04 for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt1-0006XP-Sb for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:12 -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 1qLlsu-0000bF-UF; Tue, 18 Jul 2023 10:41:06 -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=XY3oY6oXkvjjLIfi2X6mEOyGIsjqnCzJrzW6NUdonpA=; b=b2dvOcwAH4gWthXyoo6Q VlEZb7Gwer6A1UP/Blf3gwb5u3mFTU0+yyFe8PQ4eziuF24NeQVeHSmXsETfSw4NEl9oZ5LMRVCG/ Bh5GBcsghLz8sSU6u5crbxz62nxDv1VcaadgiwlRcXbhsYNuFUQgGfJxmycbzi7nEdjMcmPMnC2Hu WeUNeeY5bqSlr1FpQxeQors5hxyhx7Ot0Evdc+l6HXhvg/7FgRBtVxEtAl8vFI1wd2jmh724a+LRl JCuVT3AH5vf/9RjLxBicWb6xKFKk8hpka71s50HfKNSrSyPOvNme2tzxZkHU1hS59FxEkltSv1/Yz P0Dz7sJtwv0E6Q==; 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 1qLlsu-0004hp-5K; Tue, 18 Jul 2023 10:41:04 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:06 +0200 Message-Id: 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/elf.scm (elfutils)[arguments]: When building natively on the Hurd, add phase 'skip-tests'. --- gnu/packages/elf.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index d188099812..a100038f14 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Leo Le Bouter ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -112,6 +113,28 @@ (define-public elfutils (("run-reverse-sections-self.sh") "") (("run-strip-strmerge.sh") "") (("run-elflint-self.sh") ""))))) + '()) + ,@(if (system-hurd?) + `((add-after 'unpack 'skip-tests + (lambda _ + (substitute* '("tests/elfstrtab.c" + "tests/emptyfile.c") + (("elf_version \\(EV_CURRENT\\);" all) + "exit (77);")) + (substitute* '("tests/run-all-dwarf-ranges.sh" + "tests/run-allfcts-multi.sh" + "tests/run-attr-integrate-skel.sh" + "tests/run-bug1-test.sh" + "tests/run-copyadd-sections.sh" + "tests/run-deleted.sh" + "tests/run-get-units-split.sh" + "tests/run-native-test.sh" + "tests/run-readelf-loc.sh" + "tests/run-readelf-ranges.sh" + "tests/run-unit-info.sh" + "tests/run-varlocs.sh") + (("^#!.*" all) + (string-append all "exit 77;\n")))))) '())))) (native-inputs (list m4)) From patchwork Tue Jul 18 14:40:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51798 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 53AED27BBEA; Tue, 18 Jul 2023 15:42:31 +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 A620B27BBE2 for ; Tue, 18 Jul 2023 15:42:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltw-0007dm-0K; Tue, 18 Jul 2023 10:42:08 -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 1qLltt-0007Xc-9Y for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -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 1qLlts-0000uT-Uv for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlts-0006dR-Qm for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 14/43] gnu: libbsd: Skip failing test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:04 +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.168969127525233 (code B ref 64711); Tue, 18 Jul 2023 14:42:04 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:15 +0000 Received: from localhost ([127.0.0.1]:53770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt4-0006Yp-I0 for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt1-0006XQ-Sh for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:12 -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 1qLlsw-0000bo-LK; Tue, 18 Jul 2023 10:41:06 -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=6pGKgh5aZa9fIqJpEXVoMxuLEcihlPmZ/84jNCDnSm4=; b=ad7b98DNhim4gMdV3f1j ywv7py0OskCdwaW4hlX0SfH35sQhiO4jGLHnakcalIqtkCu3HOV1j9QAwh2GJ/LtyAyw8tYvDihYJ FeCNXeyTcfNvwWMrt6qANgo9XxeYxPkbDE4H1wnleWq6yedpUNFgm2qvwuA+N+Vh4TKMS6l3oKLCu YWKkyZKLxl9ygiZlsn+PzwD/YCezCA8ZSvaO8ggPSE0FAw5jPzoHSqxJ/+bMfqhULk43jK8N/7OnG qOd6IAwvjg0lmmmEMtGAKnygunZ+jWeVqRCKw3vSntu7GN1D8wsVCvcSqOtaUOM+0U7j1RAuY34+K sEaxBO6naiDblQ==; 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 1qLlsv-0004hp-Dn; Tue, 18 Jul 2023 10:41:06 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:07 +0200 Message-Id: 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/libbsd.scm (libbsd)[arguments]: When building natively on the Hurd, add stage 'skip-tests'. --- gnu/packages/libbsd.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libbsd.scm b/gnu/packages/libbsd.scm index 79f1389081..46a11a61e2 100644 --- a/gnu/packages/libbsd.scm +++ b/gnu/packages/libbsd.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2022 Marius Bakke +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ (define-module (gnu packages libbsd) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (gnu packages crypto)) (define-public libbsd @@ -64,7 +66,15 @@ (define-public libbsd ;; build container. (substitute* "test/Makefile" (("pwcache\\$\\(EXEEXT\\) ") - ""))))))) + "")))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'skip-tests + (lambda _ + (substitute* "test/explicit_bzero.c" + (("(^| )main *\\(.*" all) + (string-append all + "{\n exit (77);//")))))) + #~())))) (inputs (list libmd)) (synopsis "Utility functions from BSD systems") From patchwork Tue Jul 18 14:40:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51815 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 8C83927BBF7; Tue, 18 Jul 2023 15:44:01 +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 813A627BBE2 for ; Tue, 18 Jul 2023 15:43:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlty-0007iO-Dh; Tue, 18 Jul 2023 10:42:10 -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 1qLltu-0007Yi-3Q for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -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 1qLltt-0000uj-Rc for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltt-0006dg-Nt for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 15/43] gnu: c-ares: Skip failing tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:05 +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.168969128325268 (code B ref 64711); Tue, 18 Jul 2023 14:42:05 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:23 +0000 Received: from localhost ([127.0.0.1]:53776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltC-0006ZS-Lo for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt2-0006XX-TQ for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:13 -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 1qLlsx-0000cK-Ls; Tue, 18 Jul 2023 10:41:07 -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=yMUI/P27AJEPXsaKNC0epovnDsh6NLgPV4h2doxaewo=; b=JMmEP+8/2uyNvXUvROON oT6PS8a584mUkgSpM7eoqK1ofLvyJg31Rr7dtyAZ3n7JBrm/wGmqzQyUk6gZ1P8P8M47m6YS1V05h +nm5Qfi9gr0I3nwQSvxhCXSeBz5LM1W7xatOJofiucwpdVKlQAR9dHAvF3eC/SDFf4m7BTQe0pAJr MO2gpXAfkdEMzaaIyV6tOhKxnk0FSwq1njHuFJq1jql8xrjy6smgJ4AYeqGXp8AFyPBrytmcGS7uO 4s6qKnY5COGbzcYUapPu/HIV8kjscKPtMFNgFA3SQ+dXR3jczTRLYEw8/OvxL3dxhLV7ILkvMwRsG Hz9QMoj6jHbzUA==; 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 1qLlsx-0004hp-93; Tue, 18 Jul 2023 10:41:07 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:08 +0200 Message-Id: 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/adns.scm (c-ares)[arguments: When building natively on the Hurd, add phases 'skip-tests' and 'filter-hurd-tests'. --- gnu/packages/adns.scm | 68 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 913d885af4..ead40bce1b 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019, 2021 Marius Bakke +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,9 +21,11 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages adns) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages m4) @@ -76,18 +79,69 @@ (define-public c-ares "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'filter-live-tests - (lambda _ - ;; Filter tests that require internet access. - (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'filter-live-tests + (lambda _ + ;; Filter tests that require internet access. + (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*"))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'skip-tests + (lambda _ + (substitute* "test/ares-test-main.cc" + (("(^| )main *\\(.*" all) + (string-append all " exit (77);\n"))))) + (add-after 'filter-live-tests 'filter-hurd-tests + (lambda _ + (setenv "GTEST_FILTER" + (string-append + (getenv "GTEST_FILTER") + ":.*Basic/2" + ":.*CancelImmediate/2" + ":.*CancelImmediateGetHostByAddr/2" + ":.*CancelLater/1" + ":.*FamilyUnspecified/2" + ":.*FamilyV6/2" + ":.*GetAddrInfoParallelLookups/1" + ":.*GetHostByAddrDestroy/2" + ":.*GetHostByNameCNAMENoData/2" + ":.*GetHostByNameDestroyAbsolute/2" + ":.*GetHostByNameDestroyRelative/2" + ":.*GetHostByNameParallelLookups/1" + ":.*HostAlias/2" + ":.*HostAliasMissing/2" + ":.*HostAliasMissingFile/2" + ":.*NotImplResponse/2" + ":.*RefusedResponse/2" + ":.*Resend/1" + ":.*RetryWithoutEDNS/2" + ":.*SearchDomains/2" + ":.*SearchDomainsBare/2" + ":.*SearchDomainsServFailOnAAAA/2" + ":.*SearchDomainsWithResentReply/1" + ":.*SearchHighNdots/2" + ":.*SearchNoDataThenFail/2" + ":.*SearchNoDataThenNoDataBare/2" + ":.*SearchNoDataThenSuccess/2" + ":.*ServFailResponse/2" + ":.*SimpleQuery/2" + ":.*SockCallback/2" + ":.*SockConfigureCallback/2" + ":.*SortListV4/2" + ":.*SortListV6/2" + ":.*ThirdServer/2" + ":.*TruncationRetry/1" + ":.*UnspecifiedFamilyCname6A4/2" + ":.*UnspecifiedFamilyV4/2" + ":.*UnspecifiedFamilyV6/2"))))) + #~())))) (native-inputs (list pkg-config)) (home-page "https://c-ares.haxx.se/") (synopsis "C library for asynchronous DNS requests") (description - "C-ares is a C library that performs DNS requests and name resolution + "C-ares is a C library that performs DNS requests and name resolution asynchronously. It is intended for applications which need to perform DNS queries without blocking, or need to perform multiple DNS queries in parallel. The primary examples of such applications are servers which communicate with From patchwork Tue Jul 18 14:40:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51817 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 841AC27BBE2; Tue, 18 Jul 2023 15:44:04 +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 0CE7927BBEE for ; Tue, 18 Jul 2023 15:43:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltz-0007kM-E4; Tue, 18 Jul 2023 10:42:11 -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 1qLltu-0007ac-Eh for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -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 1qLltu-0000uv-6p for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltu-0006dn-3V for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 16/43] gnu: libgpg-error: Skip failing test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:06 +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.168969128425275 (code B ref 64711); Tue, 18 Jul 2023 14:42:06 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:24 +0000 Received: from localhost ([127.0.0.1]:53778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltD-0006ZV-9C for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt4-0006Xe-C4 for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:15 -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 1qLlsz-0000co-53; Tue, 18 Jul 2023 10:41:09 -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=5QTvMQjTe9k7h+h5glKkUFI5ff+hB+mx8y/KAekkCL4=; b=okn4e2KGaOW/xbKl/zMt lAtIB64RZdOiY/UG2HtVjBJd1i0OaP9zp6qtd+NClrCamO7b/+qt3fcm6AUn+h7Qt36Jz04yrJXgn 52dM6Idm8cN+v7iQ41wr0iGA2FNHuD3vbkTOAXHkVXo/dgX47BI+AraslsMEOo2cAfNSVhrCRhX2Y mRsDgrziYN5CUhsebk13lChsTuBB9F5ZdSutoTxCp4BsM6HQt8XYpBOdip0Upwb47tzrcnygsKqci tg2dbLRiB2lftihbtID/vJZdGImNHQM1LAj5Bib+1Bw4hM0v0Ka0y14uX3t7DJAI5HjZjL44BA4OI yVejrqHLtmWD4A==; 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 1qLlsy-0004hp-8l; Tue, 18 Jul 2023 10:41:08 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:09 +0200 Message-Id: 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/gnupg.scm (libgpg-error)[arguments]: When building natively on the Hurd, add phase 'skip-tests'. --- gnu/packages/gnupg.scm | 82 ++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 49d29ed9bd..4a9a8fbb57 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2021 Nikita Domnitskii ;;; Copyright © 2021 Aleksandr Vityazev ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -94,40 +95,42 @@ (define-public libgpg-error (version "1.45") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-" - version ".tar.bz2")) - (sha256 - (base32 - "09haz1kk48b8q0hd58g98whylah0fp121yfgjms7pzsbzgj8w3sp")))) + (method url-fetch) + (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-" + version ".tar.bz2")) + (sha256 + (base32 + "09haz1kk48b8q0hd58g98whylah0fp121yfgjms7pzsbzgj8w3sp")))) (build-system gnu-build-system) (arguments - (if (%current-target-system) - `(#:modules ((guix build gnu-build-system) - (guix build utils)) - #:phases - (modify-phases %standard-phases - ;; If this is left out, some generated header - ;; files will be sprinkled with ‘\c’, which - ;; the compiler won't like. - (add-after 'unpack 'fix-gen-lock-obj.sh - (lambda _ - (substitute* "src/gen-lock-obj.sh" - (("if test -n `echo -n`") "if ! test -n `echo -n`")))) - ;; When cross-compiling, some platform specific properties cannot - ;; be detected. Create a symlink to the appropriate platform - ;; file if required. Note that these platform files depend on - ;; both the operating system and architecture! - ;; - ;; See Cross-Compiling section at: - ;; https://github.com/gpg/libgpg-error/blob/master/README - (add-after 'unpack 'cross-symlinks - (lambda _ - (define (link triplet source) - (symlink (string-append "lock-obj-pub." triplet ".h") - (string-append "src/syscfg/lock-obj-pub." - source ".h"))) - ,(let* ((target (%current-target-system)) + (cond + ((%current-target-system) + (list + #:modules '((guix build gnu-build-system) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + ;; If this is left out, some generated header + ;; files will be sprinkled with ‘\c’, which + ;; the compiler won't like. + (add-after 'unpack 'fix-gen-lock-obj.sh + (lambda _ + (substitute* "src/gen-lock-obj.sh" + (("if test -n `echo -n`") "if ! test -n `echo -n`")))) + ;; When cross-compiling, some platform specific properties cannot + ;; be detected. Create a symlink to the appropriate platform + ;; file if required. Note that these platform files depend on + ;; both the operating system and architecture! + ;; + ;; See Cross-Compiling section at: + ;; https://github.com/gpg/libgpg-error/blob/master/README + (add-after 'unpack 'cross-symlinks + (lambda _ + (define (link triplet source) + (symlink (string-append "lock-obj-pub." triplet ".h") + (string-append "src/syscfg/lock-obj-pub." + source ".h"))) + #$(let* ((target (%current-target-system)) (architecture (string-take target (string-index target #\-)))) (cond ((target-linux? target) @@ -140,8 +143,19 @@ (define-public libgpg-error ;; configuration, as this is not correct for ;; all architectures. (_ #t))) - (#t #t))))))) - '())) + (#t #t)))))))) + ((system-hurd?) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-tests + (lambda _ + (substitute* + "tests/t-syserror.c" + (("(^| )main *\\(.*" all) + (string-append all "{\n exit (77);//")))))))) + (else + '()))) (native-inputs (list gettext-minimal)) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") From patchwork Tue Jul 18 14:40:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51827 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 E706C27BBEA; Tue, 18 Jul 2023 15:44:38 +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 7065527BBE2 for ; Tue, 18 Jul 2023 15:44:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltx-0007fl-3B; Tue, 18 Jul 2023 10:42:09 -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 1qLltu-0007co-Vc for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -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 1qLltu-0000v2-Ml for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltu-0006dy-JK for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 17/43] gnu: libgcrypt: Skip hanging benchmark tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:06 +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.168969128425281 (code B ref 64711); Tue, 18 Jul 2023 14:42:06 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:24 +0000 Received: from localhost ([127.0.0.1]:53780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltD-0006Zc-Qh for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltA-0006Z2-AA for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:20 -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 1qLlt5-0000fu-2t; Tue, 18 Jul 2023 10:41:15 -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=PY5bwWjqMMa/Mw45VN6jCrlAwBzcouuo/8mbU4Jzvq8=; b=dcRgQ7lTevMC4jN1iI/G Q4ec+cJJyqhL/vWixar/M5vPd3YLEW9WqeyA8dAYs602apC3E/jldrmzGlMd/xWDV5xhp5McYo9Ij lXxpQa6Pg8Yd4PUePErrQ6xRrZnya7fHYgB4Gf7HeXIpSClCAiqSIWHLVd34ely0+I4pcdIc8WCqC n8WbbogrfiuQ44e2gIAdn41mrE3gnkySvaEkBekpX/SUBbJ5MqyWlN/gLbKxD1ZmhnQ7DQRIBbig0 MvW5iwY44b4SlYIT2D4xAM7Hort1r6RVyOtQ028eF2ASdcI9WZpbWIERfaJ14z8RZNSAI7INTGAZe qUCtdes8i5TlUg==; 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 1qLlsz-0004hp-Kh; Tue, 18 Jul 2023 10:41:14 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:10 +0200 Message-Id: <6d5f627b409a5d4dc7ddc19cd22957685eb2d07f.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/gnupg.scm (libgcrypt)[arguments]: When building natively on the Hurd, add phase 'setenv' to set "GCRYPT_NO_BENCHMARKS". --- gnu/packages/gnupg.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 4a9a8fbb57..8d92c60bf2 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -204,7 +204,15 @@ (define-public libgcrypt ,@(if (%current-target-system) ;; When cross-compiling, _gcry_mpih_lshift etc are undefined. `("--disable-asm") - '())))) + '())) + ,@(if (system-hurd?) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (setenv "GCRYPT_NO_BENCHMARKS" "t"))))) + '()))) (outputs '("out" "debug")) (home-page "https://gnupg.org/") (synopsis "Cryptographic function library") From patchwork Tue Jul 18 14:40:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51818 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 BB7D927BBE2; Tue, 18 Jul 2023 15:44:06 +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 6BE4E27BBED for ; Tue, 18 Jul 2023 15:44:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlty-0007hH-4O; Tue, 18 Jul 2023 10:42:10 -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 1qLltv-0007d2-Hv for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -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 1qLltv-0000vC-4L for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltv-0006e5-1C for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 18/43] gnu: tcl: Remove failing tests on the Hurd.. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:06 +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.168969129225305 (code B ref 64711); Tue, 18 Jul 2023 14:42:06 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:32 +0000 Received: from localhost ([127.0.0.1]:53784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltM-0006a5-7O for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltK-0006Zq-EN for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:31 -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 1qLltF-0000iO-7H; Tue, 18 Jul 2023 10:41:25 -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=5/dytSbkcioNRlWk8R7GEJvGSyMFnri7NdaCNk87zxo=; b=byliExNxLWH6vpXsmRkV SjMEz/p88MOY5TYM3U1eoK+VixMBuLLJf8nZ62gx7oUoKygryDG08RfZY4tJP9rKKurkHK5Aqsa2y 4ooNChp0ACFU0GY//t7skCUQhGrh1dcQsGh5veQesxOLFlPhS1ri7OLPIUQhfpn7/DvaUHG3rhhTB ifitmSxEphXeXkqnpMqjNwjHlufqczeo5F0YdVP8XEsINy6Gix2FRxrbpqrPo8cVLo2OWfKsIEGvS B78cSaGMZAUq5mzhqHImwBlRrcZitpqcbtVl7CIK3H8rXnklSPDohHHw5V9GYRK0NoZilLyUSLiJx Q+mFsQwGsfBEmQ==; 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 1qLlt5-0004hp-NB; Tue, 18 Jul 2023 10:41:25 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:11 +0200 Message-Id: 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/tcl.scm (tcl)[arguments]: When building natively on the Hurd, add phase 'delete-tests'. --- gnu/packages/tcl.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 2a5fbc6fe8..b69dba2254 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016, 2018 Efraim Flashner -;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2018, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Julien Lepiller @@ -69,7 +69,13 @@ (define-public tcl ;; Programs such as Ghostscript rely on it. (with-directory-excursion bin (symlink (car (find-files "." "tclsh")) - "tclsh")))))) + "tclsh"))))) + ,@(if (system-hurd?) + '((add-after 'unpack 'delete-tests + (lambda _ + (delete-file "tests/chanio.test") + (delete-file "tests/socket.test")))) + '())) ;; By default, man pages are put in PREFIX/man, but we want them in ;; PREFIX/share/man. The 'validate-documentation-location' phase is From patchwork Tue Jul 18 14:40:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51812 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 625D327BBF5; Tue, 18 Jul 2023 15:43:57 +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 958EB27BBEA for ; Tue, 18 Jul 2023 15:43:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlty-0007h5-2w; Tue, 18 Jul 2023 10:42:10 -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 1qLltv-0007dj-Sz for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -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 1qLltv-0000vH-I1 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltv-0006eC-Et for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 19/43] gnu: curl: Skip failing test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:07 +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.168969129725334 (code B ref 64711); Tue, 18 Jul 2023 14:42:07 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:37 +0000 Received: from localhost ([127.0.0.1]:53792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltQ-0006aS-Ml for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltN-0006Zv-UQ for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:35 -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 1qLltH-0000iw-If; Tue, 18 Jul 2023 10:41:28 -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=bbyKN4IR8JqW11DUEUqTeAfkePcBKiTpBBGyXjU3P1g=; b=ia6cGhGrrvzXGRLTaA4m tjlkiIIaDV3kJGelPCtD573U/ALTVdcZSfbOuAgWMeVfY44n1DxbKTaqKaS4qwB6DTNIzPvvcGLhK UsjD+N8hAY/XoUoCU+HbWXmNujKi8onkBVtvL8N3MhRIhZizFExcSECg2LlQAbuv+97vzx4a4Z8Ob 9tn0v+GfIXElroeglADPM306bV6Kg5XVAN3DRBfQuJieOv8UtdJkqOpq8lsxym4vQdYAmOmEmcWGz EHaA1vsN0BS9V6mBosMliGe+Os5kHVhCe3MOf80EoZlALB4J3+6YLIGOqU5cO/2mPSS7BwWCEQSvd qBDy9tBCVriUYQ==; 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 1qLltF-0004hp-Pl; Tue, 18 Jul 2023 10:41:27 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:12 +0200 Message-Id: <7620b5c7b0b746184ff5666719e0102059b14a3e.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/curl.scm (curl)[arguments]: When building natively on the Hurd, add phase 'skip-tests'. --- gnu/packages/curl.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 76fcc115cf..4e3c563570 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2019, 2021 Ricardo Wurmus ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Dale Mellor -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2023 Sharlatan Hellseher @@ -125,7 +125,22 @@ (define-public curl ;; The top-level "make check" does "make -C tests quiet-test", which ;; is too quiet. Use the "test" target instead, which is more ;; verbose. - (invoke "make" "-C" "tests" "test"))))))) + (invoke "make" "-C" "tests" "test")))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'skip-tests + (lambda _ + (let ((port (open-file "tests/data/DISABLED" "a"))) + (display "526\n" port) + (display "527\n" port) + (display "532\n" port) + (display "533\n" port) + (display "537\n" port) + (display "546\n" port) + (display "575\n" port) + (display "1021\n" port) + (display "1501\n" port) + (close port))))) + #~())))) (synopsis "Command line tool for transferring data with URL syntax") (description "curl is a command line tool for transferring data with URL syntax, From patchwork Tue Jul 18 14:40:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51801 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 8705527BBEB; Tue, 18 Jul 2023 15:42:48 +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 2EF2B27BBE9 for ; Tue, 18 Jul 2023 15:42:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlty-0007ij-GB; Tue, 18 Jul 2023 10:42:10 -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 1qLltw-0007eW-69 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:08 -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 1qLltv-0000vR-U8 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltv-0006eK-Qo for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 20/43] gnu: git: Skip failing test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:07 +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.168969129725342 (code B ref 64711); Tue, 18 Jul 2023 14:42:07 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:37 +0000 Received: from localhost ([127.0.0.1]:53794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltR-0006aZ-5H for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltO-0006Zw-3e for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:35 -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 1qLltI-0000jV-T6; Tue, 18 Jul 2023 10:41:28 -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=u7nwnlijL6doRuVD0N+yhWhyrkL5SzGE4Kt81IbNxWk=; b=WzlJCCZ5vcof1UMN4xOt moCK2euTMOXPv6yRiysthu1rVsNUmVbD4nkoKM80ccw0VJQhqRT1YBcY7Fh5Bqh2H0PafE2INmjIl fLHPTQ2Ehv3fDRQmQjpKfi6JXixQspQD9AF6/YrCthQll2cdwZBRZmQyHQDFD1SLwok0jmT5/xxIt el0lfzGWihwNynIc6lt1AI3UFqVRUutnOEzJ6iBuRK5TRSfAHgGl0iJYGVdIctkYrn8AXjPxIPTf9 rMo8hvhcus2nATeOp+ZyZbth4O5pdMCLfTmdYT5t5G9aC6UWgt2J4dd4hLISxIcg5sB5/TKSW+/RJ DbD45fHZWl+ZBg==; 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 1qLltI-0004hp-4Q; Tue, 18 Jul 2023 10:41:28 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:13 +0200 Message-Id: <9b63cf847b0dc644fea5cd1baef6c91dd345b11d.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/version-control.scm (git)[arguments]: When building natively on the Hurd, add stage 'delete-tests/hurd'. --- gnu/packages/version-control.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ecdb1d1781..2f70655ac1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 John D. Boy -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020, 2021, 2022 Michael Rohleder @@ -570,7 +570,14 @@ (define-public git (manpages (assoc-ref inputs "git-manpages"))) (mkdir-p man) (with-directory-excursion man - (invoke "tar" "xvf" manpages)))))))) + (invoke "tar" "xvf" manpages))))) + ,@(if (system-hurd?) + '((add-after 'unpack 'delete-tests/hurd + (lambda _ + (delete-file "t/t0052-simple-ipc.sh") + (delete-file "t/t5562-http-backend-content-length.sh") + (delete-file "t/t9902-completion.sh")))) + '())))) (native-search-paths ;; For HTTPS access, Git needs a single-file certificate bundle, specified From patchwork Tue Jul 18 14:40:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51805 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 C0C4C27BBEC; Tue, 18 Jul 2023 15:43:08 +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 0C86C27BBE2 for ; Tue, 18 Jul 2023 15:43:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlu0-0007ov-WF; Tue, 18 Jul 2023 10:42:13 -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 1qLlty-0007hK-4U for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -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 1qLltx-0000vk-Qq for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltw-0006eR-94; Tue, 18 Jul 2023 10:42:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 21/43] gnu: emacs: Depend on libc-for-target. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:08 +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 Cc: Andrew Tropin , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Liliana Marie Prikler Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969130125359 (code B ref 64711); Tue, 18 Jul 2023 14:42:08 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:41 +0000 Received: from localhost ([127.0.0.1]:53798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltU-0006av-Mf for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltQ-0006Zz-CD for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:36 -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 1qLltL-0000jx-1w; Tue, 18 Jul 2023 10:41:31 -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=cp2/QHj1iciDaxVZQw9bKykgCwEF6AByj7F30/xJJBI=; b=HNTJych6it4R1EgzpI++ 0u29PO2OU5EXfaE7cWpubGcCVXYXjYNcKPcspUgwX3HcFINH9oqsNG1OIp+UOlJsdhsJoprZHcdR8 ai2TBld8pLRNC56nyYRrne1pkVnZlN2zyyOCjKpFOgBG92e2EXN+PSGlubTAzWH++Cyw84inJ+eyi YabZ3M/kzL6WqpVUA9mG+r+JpIzQifVt67IWyA0E7zxBaLPTs5MMNjgYEBaKaF1KkJ8VR/EWxpVh7 CCWSP01B9177bJZNa+SVS2Xs0DpX9vRt4tVaZoaPWAR1DiLiK4QIR7iSE92hpo0GBa8IbvYixTf8P kCZV81N3Q1QDbQ==; 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 1qLltJ-0004hp-Ch; Tue, 18 Jul 2023 10:41:30 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:14 +0200 Message-Id: <1ae38ee32d483d5003d0728b9b63676f9ae50f08.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/emacs.scm (emacs)[inputs]: Change glibc to (libc-for-target). --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 437564f6f0..d3689c2474 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017, 2019, 2020 Maxim Cournoyer ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Ricardo Wurmus -;;; Copyright © 2017 Jan Nieuwenhuizen +;;; Copyright © 2017, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2018, 2023 Efraim Flashner ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice @@ -310,7 +310,7 @@ (define-public emacs ;; For native compilation binutils - glibc + (libc-for-target) libgccjit ;; Required for "core" functionality, such as dired and compression. From patchwork Tue Jul 18 14:40:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51814 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 271F927BBEC; Tue, 18 Jul 2023 15:44:00 +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 1C26127BBF1 for ; Tue, 18 Jul 2023 15:43:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltz-0007kY-Oq; Tue, 18 Jul 2023 10:42:11 -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 1qLltx-0007gi-Ue for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -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 1qLltw-0000vc-UE for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltw-0006eX-Kk; Tue, 18 Jul 2023 10:42:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 22/43] gnu: procps: Skip linux-version test for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:08 +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 Cc: Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969130125372 (code B ref 64711); Tue, 18 Jul 2023 14:42:08 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:41 +0000 Received: from localhost ([127.0.0.1]:53802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltV-0006ay-5s for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltS-0006aD-Fi for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:39 -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 1qLltN-0000kJ-8g; Tue, 18 Jul 2023 10:41:33 -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=9grFm2qMKZn2ZLDUh/Hz74jZHUpiOOPWB2JnZc2jvYs=; b=evLgI7C1miC+zkDv8ChL aJe1blE3WfwMe9CAzDnNfcWztZTRokw8z17RwpCwOaAusi74i9Y6rBNejrsV2BngJIQ05+HkLYzAR wAsaScpbZglNg1E0q3Lu34uRZ/kLJXJvbveSCF2PvVlst2gzs3HUbBeZkLQYJDSw2Dn5Hqx5qkfpz bDshTivC5U1ZKH9GdVDCVKrlzMS05aF6X+xKVXsP5SukqBkkKNSLLFdJ33EOUZY/HQO013253+ZQA VJ+gAzzPVoQkrPPwfZ1aZfrIed7Fw/3VusvMbnocb3Ed0a9dQJ6uS7zkRLQ2Aye4o6BzjWxELTFLv Ks1qfRKc37J0kw==; 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 1qLltL-0004hp-Hv; Tue, 18 Jul 2023 10:41:33 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:15 +0200 Message-Id: <4731c0f34c71c0554e235fa8b47b74be18173347.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/linux.scm (procps)[arguments]: When building natively on the Hurd, add stage 'skip-tests'. --- gnu/packages/linux.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 39503de6ff..190c28cb60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -42,7 +42,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2020 Vincent Legoll -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2020 John Soo ;;; Copyright © 2020, 2022 Michael Rohleder @@ -2390,7 +2390,14 @@ (define-public procps (let* ((out #$output) (dup (append-map (cut find-files out <>) '("^kill" "^uptime")))) - (for-each delete-file dup))))))) + (for-each delete-file dup)))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'skip-tests + (lambda _ + (substitute* "library/tests/test_version.c" + (("^int main\\(.*" all) + (string-append all "{\n exit (77);//")))))) + #~())))) (inputs (list ncurses)) (native-inputs (list pkg-config)) (home-page "https://gitlab.com/procps-ng/procps/") From patchwork Tue Jul 18 14:40:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51803 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 1171927BBE9; Tue, 18 Jul 2023 15:42:57 +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=unavailable 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 0EF8F27BBE2 for ; Tue, 18 Jul 2023 15:42:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlu0-0007op-Tu; Tue, 18 Jul 2023 10:42:12 -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 1qLltx-0007gu-VT for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -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 1qLltx-0000vf-5t for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltx-0006ej-2e; Tue, 18 Jul 2023 10:42:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 23/43] gnu: e2fsprogs: Skip failing tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:09 +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 Cc: Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969130625394 (code B ref 64711); Tue, 18 Jul 2023 14:42:09 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:46 +0000 Received: from localhost ([127.0.0.1]:53808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltZ-0006bV-Od for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltU-0006aQ-Td for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:41 -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 1qLltO-0000kV-MC; Tue, 18 Jul 2023 10:41:34 -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=Ts4o1yAPeuIUSg85Z53Sm1t3w682UaK71H7o2pZTYQg=; b=rtwuj8xn1F4FeelBrtil dK11xvssZTFA9wpqfkXKxMTOoUS09NsNSQlMe4jivUlgH0l+rv51XFifDGzNqV1AA+E9rX0Fj8BSk V5G6Z7d6BjIpBYEPLNJ9+JiaYEJQs1jVtryedT6OiukkmgXVGJhPTzoDyIipUZjAYPjTg+si1tQvJ JzxBBuPseIwCvhy4XxenQAVjmBBcZh/HOoF0X8P/migkUu36huEnfYu68PeNgd75onry2RrufLDue Mkf2IA000Kl/c7ohR5zlPjqiKGNT0q1k3H9inkkGPyncp6DV+f4G38DRMMiga/sfXCEeyc7ok4rQ/ YGXW/V22JIjNjw==; 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 1qLltN-0004hp-SG; Tue, 18 Jul 2023 10:41:34 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:16 +0200 Message-Id: <02f3ee45f249be83aee4be35f9ed49109dfd074c.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/linux.scm (e2fsprogs)[arguments]: When building natively on the Hurd, add phase 'skip-tests'. --- gnu/packages/linux.scm | 74 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 190c28cb60..81658534b5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2505,7 +2505,7 @@ (define-public e2fsprogs perl procps)) (arguments - '(;; util-linux is the preferred source for some of the libraries and + `(;; util-linux is the preferred source for some of the libraries and ;; commands, so disable them (see, e.g., ;; .) #:configure-flags (list "--disable-libblkid" @@ -2552,7 +2552,77 @@ (define-public e2fsprogs (let ((archives (find-files lib "\\.a$"))) (for-each (lambda (file) (chmod file #o666)) - archives)))))))) + archives))))) + ,@(if (system-hurd?) + '((add-after 'unpack 'skip-tests + (lambda _ + (with-directory-excursion "tests" + (for-each + (lambda (directory) + (delete-file-recursively directory)) + '("d_bad_ostype" + "f_detect_junk" + "f_extent_oobounds" + "j_ext_long_revoke_trans" + "j_ext_long_trans" + "j_long_revoke_trans" + "j_long_revoke_trans_mcsum_32bit" + "j_long_revoke_trans_mcsum_64bit" + "j_long_trans" + "j_long_trans_mcsum_32bit" + "j_long_trans_mcsum_64bit" + "j_short_revoke_trans" + "j_short_revoke_trans_mcsum_64bit" + "j_short_trans_64bit" + "j_short_trans" + "j_short_trans_mcsum_64bit" + "j_short_trans_old_csum" + "j_short_trans_open_recover" + "j_short_trans_recover" + "j_short_trans_recover_mcsum_64bit" + "j_short_uncommitted_trans" + "j_short_uncommitted_trans_mcsum_64bit" + "m_error_behavior" + "m_minrootdir" + "m_rootdir" + "r_32to64bit_expand_full" + "r_expand_full" + "r_fixup_lastbg_big" + "t_change_uuid" + "t_change_uuid_mcsum" + "t_change_uuid_mcsum_mounted" + "t_change_uuid_mcsum_seed_mounted" + "t_change_uuid_mounted" + "t_disable_changed_csum_seed" + "t_disable_changed_csum_seed_mounted" + "t_disable_csum_seed" + "t_disable_meta_csum_and_seed" + "t_enable_csum_seed" + "t_format_csum_seed" + "t_replay_and_set" + "u_compound_rollback" + "u_corrupt_blk_csum" + "u_corrupt_blk_csum_force" + "u_corrupt_key_csum" + "u_debugfs_opt" + "u_dryrun" + "u_e2fsck_opt" + "u_errorout" + "u_force" + "u_force_dryrun" + "u_incomplete" + "u_mke2fs_opt" + "u_mke2fs_opt_oddsize" + "u_offset" + "u_onefile_bad" + "u_resize2fs_opt" + "u_revert_64bitmcsum_onefile" + "u_revert_all_onefile" + "u_revert_upgrade_to_64bitmcsum" + "u_tune2fs_opt" + "u_undo_undo" + "u_wrong_fs")))))) + '())))) (home-page "https://e2fsprogs.sourceforge.net/") (synopsis "Creating and checking ext2/ext3/ext4 file systems") (description From patchwork Tue Jul 18 14:40:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51809 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 6456427BBE9; Tue, 18 Jul 2023 15:43:47 +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 10CF327BBEA for ; Tue, 18 Jul 2023 15:43:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltz-0007kV-MK; Tue, 18 Jul 2023 10:42:11 -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 1qLlty-0007h0-0P for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -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 1qLltx-0000vh-Ia for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltx-0006et-FU for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 24/43] gnu: parted: Disable tests for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:09 +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.168969130625402 (code B ref 64711); Tue, 18 Jul 2023 14:42:09 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:46 +0000 Received: from localhost ([127.0.0.1]:53810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlta-0006bX-4y for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltW-0006ag-Im for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:42 -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 1qLltQ-0000lJ-WB; Tue, 18 Jul 2023 10:41:37 -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=1roXAu+tcekZ9Cx7KG+xEf00fk10hojKm22aUcQ/WXU=; b=nqnHBmYDi9pYO50hWxYE nCergK+wHYSYDpxrvTbWicQM4aFXZztRUensyTFBAVnLdxX7XIlJHUx5WRIwEot503898NpqMZIRc 1M0XQ8TsQWe0GhW+dcWDVV9IC0h6Y2vM+Voo+k7U/XU4kGMoZcTiixOepo+6zyOM75dAtu6I9oc3r coCUwhURTPTcbhj+AghU/BVE5KdzTLp+cinD4V4AmRjG6qTBlhdqtaqs5H2/eYURbh6xSzJwwQgr/ JXScMtXLidfWZtdT/CajyGZekKQ+TKAbxBqj2uiAToLg8UXd1XcgvdVKKMuZkeQ21+4XF75wmCwPq H0Y5yR8n7KPDkQ==; 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 1qLltP-0004hp-3m; Tue, 18 Jul 2023 10:41:36 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:17 +0200 Message-Id: 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/disk.scm (parted)[argument]: Set #:tests? to #false when building for the Hurd. --- gnu/packages/disk.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 6306504503..35ffcf173e 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -259,6 +259,7 @@ (define-public parted #:configure-flags (if (target-hurd?) #~'("--disable-device-mapper") #~'()) + #:tests? (not (target-hurd?)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-locales-and-python From patchwork Tue Jul 18 14:40:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51808 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 ABCB227BBE9; Tue, 18 Jul 2023 15:43:33 +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=unavailable 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 04CDC27BBE2 for ; Tue, 18 Jul 2023 15:43:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlu1-0007q3-9x; Tue, 18 Jul 2023 10:42:13 -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 1qLlty-0007iB-At for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -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 1qLlty-0000w6-2N for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltx-0006f4-UT for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 25/43] gnu: libpaper: Disable tests for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:09 +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.168969130725409 (code B ref 64711); Tue, 18 Jul 2023 14:42:09 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:47 +0000 Received: from localhost ([127.0.0.1]:53814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlta-0006bf-IO for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltX-0006an-4w for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:43 -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 1qLltR-0000la-UC; Tue, 18 Jul 2023 10:41:37 -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=B3/fp1cPN2kUH1qay6zKO4fwPsySmodhPm9fKN/u/GM=; b=G7ZAmJimxts7FUMjhdqi zLn3DyN0/IqPesGvfrpVZX5AIcOR8XvhVOw/78v6CUHBPNFUTn2K9KdeUfKB4DAYhFUdvHKafYnyu 5B3KJOAnjlO2ZqNSFEBRq64BTy+67LUbk/A5gyv0RiTTIzzxQ8Jj5yl2uYKLGGGol0Naz188bCvrC IX2Ne4phl3M3p8GJzjX0B+8xqWxBBPBfcGiaiYoGV7cR0S1X8ahoN3EgVyrfAadkSIwpZ88CDU5WV 0smYaURCjczBmdgCkNflxd1y1xY+NZRV2WxTzFWmgEL4JtxommwZcr1laKzr8uGvyl5FZ1QLCR/zJ mTNXKajLNGaTjw==; 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 1qLltR-0004hp-Hx; Tue, 18 Jul 2023 10:41:37 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:18 +0200 Message-Id: <1db7ca6153a323af76ba72404da543a7e597c024.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/ghostscript.scm (libpaper)[arguments]: When building for the Hurd, set #:tests? to #false. --- gnu/packages/ghostscript.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 8d35f1195c..94807fdd94 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020, 2022 Marius Bakke ;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,9 +89,11 @@ (define-public libpaper (native-inputs (list help2man)) (arguments - '(#:configure-flags '("--disable-static" - ;; Tests require a relocatable build. - "--enable-relocatable"))) + (list #:configure-flags ''("--disable-static" + ;; Tests require a relocatable build. + "--enable-relocatable") + ;; --enable-relocate is broken on the Hurd + #:tests? (not (target-hurd?)))) (outputs '("out" "debug")) (home-page "https://github.com/rrthomas/libpaper") (synopsis "Library for handling paper sizes") From patchwork Tue Jul 18 14:40:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51807 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 AD72927BBE9; Tue, 18 Jul 2023 15:43:19 +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=unavailable 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 4750127BBE2 for ; Tue, 18 Jul 2023 15:43:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlu1-0007qq-Hy; Tue, 18 Jul 2023 10:42:13 -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 1qLlty-0007jt-TD for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -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 1qLlty-0000wW-Km for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlty-0006fD-FX; Tue, 18 Jul 2023 10:42:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:10 +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 Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969131225427 (code B ref 64711); Tue, 18 Jul 2023 14:42:10 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:52 +0000 Received: from localhost ([127.0.0.1]:53816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltg-0006c3-4g for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlta-0006b5-CV for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:47 -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 1qLltV-0000lo-5Q; Tue, 18 Jul 2023 10:41:41 -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=8w2E8wlxCE08Q6KPeOVzxChQEzOq/9cvmcLzPrJ8oNg=; b=CqxcqOTCjhNItj16d4kC miEa+qljdLVkL2IppkvGZNIuRXzc9CznDIIFyPk4FytngxyCayFSqyKPgqcsYLT3z7Aq12KcFs0vY nrLtz256705nb0f/h4J5ygDW9nHDB8ZbQT+RCmpT/UnKhhpS4DshyPQ9xgXr+3FBVykbgkC3nD/Yt 5RGWPhV62J4rsWdzDQa+mp6LCiAdCyZlnHp0Tpylrj97Pk5b+P/Onzf0AS3qCl77XRSm6oyp1A5uO YgC8XAnFCzpWoKukVq4rSJwj+38umV5ABVSQPlhAylO8dkRN+wV1Bb1bJN/a5n1HTxhXagekrv276 TpJPRcynMN9wXQ==; 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 1qLltS-0004hp-D7; Tue, 18 Jul 2023 10:41:40 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:19 +0200 Message-Id: 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 Gobject-introspection and libdrm does not build for the Hurd. Poppler depends on nss, which does not build for the Hurd. * gnu/packages/gtk.scm (cairo)[native-inputs]: When building for the Hurd, do not include gobject-introspection. [inputs]: Likewise, do not include libdrm, poppler. --- gnu/packages/gtk.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9621357b99..eb69a88221 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Sergiu Ivanov ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -194,15 +195,21 @@ (define-public cairo (assoc-ref %outputs "doc") "/share/gtk-doc/html")))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(,@(if (target-hurd?) + '() + `(("gobject-introspection" ,gobject-introspection))) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs `(("bash-minimal" ,bash-minimal) ;for glib-or-gtk-wrap - ("drm" ,libdrm) + ,@(if (target-hurd?) + '() + `(("drm" ,libdrm))) ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) - ("poppler" ,poppler))) + ,@(if (target-hurd?) + '() + `(("poppler" ,poppler))))) (propagated-inputs `( ;; ("cogl" ,cogl) ;; ("directfb" ,directfb) From patchwork Tue Jul 18 14:40:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51804 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 4D6AD27BBEA; Tue, 18 Jul 2023 15:43:01 +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 8997127BBE2 for ; Tue, 18 Jul 2023 15:43:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlu0-0007oq-UC; Tue, 18 Jul 2023 10:42:12 -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 1qLltz-0007kG-8F for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42: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 1qLltz-0000wf-0H for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlty-0006fM-Sk for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 27/43] gnu: openssl-1.1: Fix shared 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:42:10 +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.168969131725444 (code B ref 64711); Tue, 18 Jul 2023 14:42:10 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:57 +0000 Received: from localhost ([127.0.0.1]:53820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltk-0006cK-Jb for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlti-0006bz-8u for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:54 -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 1qLltd-0000qX-1r; Tue, 18 Jul 2023 10:41:49 -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=23D+OKs7X1wmz/a8kv8x/F6yjzYTPLZp4Xm6y4Mf5YE=; b=Tsb73C4XvPPlJI4U78FX 7V7aAzn4Xq2/xO21cEKQL3OX2GhBRATLmtxbNE2dGYfBZgytaVXswi5VbfTXYnV0VHdnRmiSpb1Vk VWfuyuTBIsgMDE55nR2q1543nw1qmyS6aLmcmLFMURoIqejTKFXmAZO72eHKK3CeWfnwUqZrCD4RR hYjf6Cr6AI7UX4yN4efu8rGvFZfYEYlcbmpptLUBiVh01sDTvNRvV4F3T48cCr4Q+ftw72dVk0WsU HLsX15PdC70FBoEtG8M+c/iacjsd1Ty23aveh71lAx//pWbQ+QrW9b4ZmeROMtzM9ASNbr8jdy82i 9qn3vRSlww8h2A==; 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 1qLltV-0004hp-L5; Tue, 18 Jul 2023 10:41:48 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:20 +0200 Message-Id: <0645e6a1b8e60469607b9b041de89203ab860a26.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/tls.scm (openssl-1.1)[arguments]: When building for the Hurd, add phase 'patch-configure'. (openssl)[arguments]: And delete it again. --- gnu/packages/tls.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e8ed0d61a4..021c125983 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -470,6 +470,13 @@ (define-public openssl-1.1 #$(target->openssl-target (%current-target-system)))))) #~()) + #$@(if (target-hurd?) + #~((add-after 'unpack 'patch-configure + (lambda _ + (substitute* "config" + (("case \"\\$GUESSOS\" in.*" all) + (string-append all "hurd-x86*) OUT=hurd-x86;;\n")))))) + #~()) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) ;; It's not a shebang so patch-source-shebangs misses it. @@ -585,7 +592,10 @@ (define-public openssl-3.0 (lambda* (#:key native-inputs inputs #:allow-other-keys) (setenv "HASHBANGPERL" (search-input-file (or native-inputs inputs) - "/bin/perl")))))) + "/bin/perl")))) + #$@(if (target-hurd?) + #~((delete 'patch-configure)) + #~()))) ((#:configure-flags flags #~'()) (if (target-hurd? (%current-system)) #~(append From patchwork Tue Jul 18 14:40:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51831 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 DB1F627BBE9; 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=unavailable 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 6DDD627BBEA for ; Tue, 18 Jul 2023 15:45:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvm-0001ZP-R1; 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-0000kq-Q5 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 1qLluo-000173-CL for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLluo-0006kC-8I; Tue, 18 Jul 2023 10:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 28/43] gnu: ruby-2.6: Skip test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:02 +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 Cc: Christopher Baines X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969133725676 (code B ref 64711); Tue, 18 Jul 2023 14:43:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:17 +0000 Received: from localhost ([127.0.0.1]:53864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu4-0006g0-VB for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu3-0006fB-Cu for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:16 -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 1qLltx-0000vy-UN; Tue, 18 Jul 2023 10:42:09 -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=tHlmaxduqm5LrOD6bWxcfoCO8q3/KD/H+YfgI1iyWsM=; b=G7lusMIKeGsNSCYnAi+N ZusRxI3FCG7y80BjVtYBq+MBUrZRgpOSgyDBMAjmENVVJENDOZyyaIbsLPU218i5ksv6kvDe+gEqc DAJFuvxIKrfRsGZtmtxqrFTHWdCyzypfHbp9XvVl2goRfAabjnCUiS237NiMaOcfm0yf8qjd/ummz ZBs4BK0KOWrWxgFB2YXGp/V+FPQ2F1DY/dPn6JAEEu0Ur7AOFePCo4rgjiakYwBFSSO5KbbYxq3sA ZWHMfviT7VEGIIGp+L2cse8eb3Q9Oz4FxqhmYZnYSvWozvuKWlnXyyUnRQwv2jxoARRnBeaEjYBcN 71KS72YRF9hVIA==; 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 1qLltd-0004hp-P9; Tue, 18 Jul 2023 10:41:57 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:21 +0200 Message-Id: <4d7dc7a5460436c781a102073ea2ad0072fd597b.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/ruby.scm (ruby-2.7)[arguments]: When building natively on the Hurd, add phase 'skip-tests'. --- gnu/packages/ruby.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b96daad0ff..e0dca646ac 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Taiju HIGASHI ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 gemmaro +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -195,7 +196,13 @@ (define-public ruby-2.7 "test/ruby/test_system.rb" "tool/rbinstall.rb") (("/bin/sh") (which "sh"))) - #t))))) + #t)) + ,@(if (system-hurd?) + '((add-after 'unpack 'skip-tests + (lambda _ + (delete-file "bootstraptest/test_io.rb") + (delete-file "test/ruby/test_io.rb")))) + '())))) (native-inputs (list autoconf)))) From patchwork Tue Jul 18 14:40:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51810 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 0AE8C27BBE9; Tue, 18 Jul 2023 15:43:48 +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=unavailable 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 F17D227BBE2 for ; Tue, 18 Jul 2023 15:43:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvM-0000v7-EA; Tue, 18 Jul 2023 10:43:39 -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-0000gF-59 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 1qLluo-000174-Rx for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLluo-0006kL-OH for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 29/43] gnu: tcsh: Skip substitution tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:02 +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.168969134025708 (code B ref 64711); Tue, 18 Jul 2023 14:43:02 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:20 +0000 Received: from localhost ([127.0.0.1]:53872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu8-0006gZ-B5 for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu4-0006fT-1H for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:16 -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 1qLlty-0000wY-Pd; Tue, 18 Jul 2023 10:42:10 -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=DZpe/gUfsxEFnfU/MldYQYwGhWLVsfwr4lu9z4N5ZEw=; b=OJjhsYGVcvJMbe6tu6BP yST5vdznbShNTMsKb8Z0+N4M7OM8SuDaz+oh8JgOUFjDoqDZK91kklowZiEXA8xT/bDxEMPR23QX3 R8ZUg1j+9I+WV+KGTqBlHc4ty5PFFW1A/AkkGbebClciL6l9Hw5CEXchypEF7uZcDQBHwRLJSe7Dy Hypi6e3CeLpyBppIh5Vt/dK0qgsT2xp4Fmnd/yWHdMBs/OH1Zh1knObtuCeA2mJ9vFBSgEpeAyYZB 2z9kXyeKSyxZl7iMtifLwO28OJhN6yoqlteBxrwLrK+DzruynFydpbhGh3viW/pBo6dSVJGn3DVAf LjmOJS+m3ZTjEg==; 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 1qLlty-0004hp-As; Tue, 18 Jul 2023 10:42:10 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:22 +0200 Message-Id: <8ab5dcc2085075a27089a970420f0609fcc8de7f.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/shells.scm (tcsh)[arguments]: When building natively on the Hurd, add phase 'skip-tests'. --- gnu/packages/shells.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0dae9ee954..aef22efd01 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2019 Timothy Sample ;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019, 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020, 2022 Efraim Flashner @@ -416,6 +416,13 @@ (define-public tcsh (("CC_FOR_GETHOST=\"cc\"") "CC_FOR_GETHOST=\"gcc\""))))) #~()) + #$@(if (system-hurd?) + #~((add-after 'unpack 'skip-tests + (lambda _ + (substitute* "tests/testsuite.at" + (("m4_include\\(\\[subst.at\\]\\)" all) + (string-append "# " all)))))) + #~()) (add-before 'check 'patch-test-scripts (lambda _ ;; Take care of pwd From patchwork Tue Jul 18 14:40:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51816 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 271F627BBE9; Tue, 18 Jul 2023 15:44:03 +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 25B7827BBF3 for ; Tue, 18 Jul 2023 15:43:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlve-00014i-W2; Tue, 18 Jul 2023 10:43:55 -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-0000kp-Pk 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-000176-BG for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlup-0006kS-84 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 30/43] gnu: swig: Skip tests when building 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.168969134125716 (code B ref 64711); Tue, 18 Jul 2023 14:43:03 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:21 +0000 Received: from localhost ([127.0.0.1]:53874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu8-0006gb-O4 for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu4-0006ff-SH for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:17 -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 1qLltz-0000wz-L3; Tue, 18 Jul 2023 10:42:11 -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=a5aGzBa0aXp7wZvpSibxEfRESt3g2ymo6cXNGC/CO/8=; b=nVWvBJl9200c29BIijxt wSOpH3fzv08mQZg9X4WBoQnw7MmXtPxBwxmpZ7XhlDgn9/oE/eP4Kav7O8/+NXJbRsrHsmjt8V5pN n7jP9bqrdF53U6SeiMG5uK6qOIyC5xtvy01mQg9DnW101XykLvXr9xuFEBA++MzVQmTfoaktChKVe l3vW/ci8TKfXgPg1Tluw7c8Ey7h2x3enD75rJLRelqnkcewTOmUHCDRhIyfitvC9evrHSpzhtQdRQ i38RnCEufx4HaBj2lyMb5oluNpcDi7tMu4dCHIJbiTKS4UmqvMnksvMTpJUK4Gl4aMUgCpEvisNz5 Uloj9W+AnMe1Ng==; 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 1qLltz-0004hp-7D; Tue, 18 Jul 2023 10:42:11 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:23 +0200 Message-Id: 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/swig.scm (swig)[arguments]: When building for the Hurd, set #:tests? to #false. --- gnu/packages/swig.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 6e2fb8b4e9..42996fa812 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018, 2021 Marius Bakke ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2020 Arun Isaac +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ (define-module (gnu packages swig) #:use-module (guix download) #:use-module (guix licenses) #:use-module (guix build-system gnu) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages boost) #:use-module (gnu packages guile) @@ -54,6 +56,7 @@ (define-public swig perl)) ;;("python" ,python-wrapper) (inputs (list pcre)) + (arguments (list #:tests? (not (target-hurd?)))) (home-page "https://swig.org/") (synopsis "Interface compiler that connects C/C++ code to higher-level languages") From patchwork Tue Jul 18 14:40:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51829 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 27ACF27BBEC; Tue, 18 Jul 2023 15:45:17 +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 57AA827BBEB for ; Tue, 18 Jul 2023 15:45:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvl-0001TT-RN; Tue, 18 Jul 2023 10:44:01 -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-0000kr-R9 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 1qLluq-00017B-6h 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 1qLluq-0006kh-2v for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 31/43] gnu: zstd: Skip tests when building 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:04 +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.168969134725741 (code B ref 64711); Tue, 18 Jul 2023 14:43:04 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:27 +0000 Received: from localhost ([127.0.0.1]:53880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluF-0006h1-1r for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu5-0006fi-VW 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 1qLlu0-0000x9-O7; Tue, 18 Jul 2023 10:42:12 -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=ydmqbNLRiD2t2rTVHRb7qGuBUQrdFHl+8+1Cr+t46jU=; b=biVSbGv8CRSkPFJfnyO0 y3TBR7VUMNZHHDp4VBCdogohf/cSaOh7JQNx8UzDtqQfCnzQBZJbg+8ii4GVPBQQWc3l0FRpuuaHb SOeSYJG1I6IexrxBc7XjSdiCuRNS77gShs4PY0G9IvgtJJ7IYkir/xHd+V8ubiqF/76uJ+1eOg78P +L/qmFXh3r6+8qfviL517cuW6Y8RnZekcmhAWHIgK+IYTl6IUlYBOhqkteUuUd1RG4T2kgPXMD2a/ P12OHr/pCQt28ofpyUUvq9BBig7KhJFhI09MI1oK2echIx1WJK6SwPVxADTBitcMiTA1vnYQxGxLN lDHQPCdmVACVDg==; 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-2z; Tue, 18 Jul 2023 10:42:12 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:24 +0200 Message-Id: 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/compression.scm(zstd)[arguments]: When building for the Hurd, set #:tests? to #false. : --- gnu/packages/compression.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 09ac57668d..e4d3293f9d 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2019 Nicolas Goaziou -;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Björn Höfling ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020, 2021 Lars-Dominik Braun @@ -1660,7 +1660,8 @@ (define-public zstd "HAVE_LZMA=0" ;; Not currently detected, but be explicit & avoid surprises later. "HAVE_LZ4=0" - "HAVE_ZLIB=0"))) + "HAVE_ZLIB=0") + #:tests? ,(not (target-hurd?)))) (home-page "https://facebook.github.io/zstd/") (synopsis "Zstandard real-time compression algorithm") (description "Zstandard (@command{zstd}) is a lossless compression algorithm 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") From patchwork Tue Jul 18 14:40:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51821 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 DB8EA27BBE2; Tue, 18 Jul 2023 15:44:09 +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 C7E3327BBED for ; Tue, 18 Jul 2023 15:44:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvk-0001Ls-Kw; Tue, 18 Jul 2023 10:44:00 -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 1qLluv-0000l1-H9 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 1qLluq-00017G-Jz 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 1qLluq-0006kp-Gw for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 33/43] gnu: cmake-minimal: Skip tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:04 +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.168969134825748 (code B ref 64711); Tue, 18 Jul 2023 14:43:04 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:28 +0000 Received: from localhost ([127.0.0.1]:53882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluF-0006h8-Hn for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu7-0006fm-Gc 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 1qLlu2-0000yq-92; Tue, 18 Jul 2023 10:42:14 -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=PdDYdPWfwr8remEqIjLxrCYgFshHN3SGYAnRQhBUwN4=; b=MFBujyRrQg/AMKYrWjke AbG0fMiLxnorispeBzn4T45v3c5eG8XFK0WQK+ZcJmS26vCM6Mf1SjwHftdAOGXUoGdOeHMwrkzFm qIY7xgM4ribgYyNCLtinVnjFahizlR+M9/mCza9747oMKxZ7xFvQwKMPJn0H9OAWcbWdKggt3LQml zkI/oMxoSYJfNcXKdFxxLVk9+XtlY3IasXLqRoeGOf5lv7kAge1luNs5QrwZHUx237EOrFMjk50Ih cPsulrimSyZO4J+wQ64s27B5iAW/PWn6kzHFKnebsOhBfWQGI141R6M8fk4H5F6bRSNhw8Zu663iv gekNnV1O63ZaQw==; 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 1qLlu1-0004hp-Rb; Tue, 18 Jul 2023 10:42:14 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:26 +0200 Message-Id: <93356f3c2b804e7e6483df30446c4448c9133ac1.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 (cmake-minimal)[arguments]: When building natively on the Hurd, add %common-disabled-tests/hurd to skipped tests in phase 'check'. --- gnu/packages/cmake.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 9064ca3822..bc14286070 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -324,7 +324,10 @@ (define-public cmake-minimal (lambda* (#:key tests? parallel-tests? #:allow-other-keys) (let ((skipped-tests (list #$@%common-disabled-tests ;; This test requires the bundled libuv. - "BootstrapTest"))) + "BootstrapTest" + #$@(if (system-hurd?) + %common-disabled-tests/hurd + #~())))) (if tests? (begin (invoke "ctest" "-j" (if parallel-tests? From patchwork Tue Jul 18 14:40:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51824 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 ACA6F27BBE9; Tue, 18 Jul 2023 15:44:24 +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 1316F27BBEA for ; Tue, 18 Jul 2023 15:44:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvo-0001gR-2P; Tue, 18 Jul 2023 10:44:04 -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-0000kt-SO 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 1qLlur-00017I-1n 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 1qLluq-0006kw-UY for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 34/43] gnu: doxygen: 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:04 +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.168969135125761 (code B ref 64711); Tue, 18 Jul 2023 14:43:04 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:31 +0000 Received: from localhost ([127.0.0.1]:53884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluI-0006hP-TP for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlu8-0006fo-TE for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:21 -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 1qLlu3-0000z2-ME; Tue, 18 Jul 2023 10:42:15 -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=sExXzDzp6AwskeNFE+VvafZfzxae7/agxlwF08QHRIU=; b=jZr+PEVtgkUBNnvJPCXq agPJY6KZMU4+FzUbGafw8PkWO+6d6l+2NDeNsYiAA55Mh/XCZ/U+jubfmYnnlA/BS5+QU9NEM8VeO JFRjVqlraRJGlzc29BXBJH2MUYf4iCJBVrZfO8BxDGrMeDIYzQXGGjoD6ZUj28IsQo4jceI+OsvpY wy578wgxFFTsqjnxX3RMbqdB3Dqypg0w157J53v2vFyf9+JiaccWs1/pCmCJ/CVbKFO/Cm+Wigeq0 Wgl8C3OZjJ1oFbgYUigl4SyXsZ5W/WyJpUAWN8AP79XjA38oxJTFe3cLSKNiuCiYLX8jvE51dK6a0 VP/ho2SH1VaDCA==; 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 1qLlu2-0004hp-Pf; Tue, 18 Jul 2023 10:42:14 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:27 +0200 Message-Id: <4afd686f160440b3af9d16481c9a7e3d3e3a241f.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/patches/doxygen-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/documentation.scm (doxygen)[arguments]: When building for the Hurd, add new phase 'apply-patch' and use it. --- gnu/local.mk | 1 + gnu/packages/documentation.scm | 12 +++++++++- gnu/packages/patches/doxygen-hurd.patch | 30 +++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/doxygen-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0d0f8c1937..84c4167723 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1066,6 +1066,7 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/dovecot-opensslv3.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ + %D%/packages/patches/doxygen-hurd.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dune-common-skip-failing-tests.patch \ diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index ec70ca4d8f..5d455431d3 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2021, 2022 Marius Bakke ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (define-module (gnu packages documentation) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix deprecation) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) @@ -224,7 +226,15 @@ (define-public doxygen (let ((/bin/sh (search-input-file inputs "/bin/sh"))) (substitute* "src/portable.cpp" (("/bin/sh") - /bin/sh)))))))) + /bin/sh))))) + #$@(if (target-hurd?) + #~((add-after 'unpack 'apply-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "doxygen-hurd.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file))))) + #~())))) (synopsis "Generate documentation from annotated sources") (description "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular diff --git a/gnu/packages/patches/doxygen-hurd.patch b/gnu/packages/patches/doxygen-hurd.patch new file mode 100644 index 0000000000..a40923184b --- /dev/null +++ b/gnu/packages/patches/doxygen-hurd.patch @@ -0,0 +1,30 @@ +Upstream status: Adapted from upstream. + +From d3d968e5835f449d7ea715f45160db81ea906303 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Tue, 16 Aug 2022 20:29:54 +0200 +Subject: [PATCH] Fix build on GNU/Hurd + +There is no path length limitation there, even via pathconf. But glibc +provides a getcwd function that allocates the buffer dynamically so we can +just leverage that. +--- + include/ghc/filesystem.hpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/filesystem/filesystem.hpp.orig 2022-08-11 22:14:32.000000000 +0200 ++++ b/filesystem/filesystem.hpp 2023-06-13 07:26:25.310000000 +0200 +@@ -4081,6 +4081,13 @@ + return path(); + } + return path(std::wstring(buffer.get()), path::native_format); ++#elif defined(__GLIBC__) ++ std::unique_ptr buffer { ::getcwd(NULL, 0), std::free }; ++ if (buffer == nullptr) { ++ ec = detail::make_system_error(); ++ return path(); ++ } ++ return path(buffer.get()); + #else + size_t pathlen = static_cast(std::max(int(::pathconf(".", _PC_PATH_MAX)), int(PATH_MAX))); + std::unique_ptr buffer(new char[pathlen + 1]); From patchwork Tue Jul 18 14:40:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51825 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 4977627BBE9; Tue, 18 Jul 2023 15:44:25 +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=unavailable 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 DD80D27BBE2 for ; Tue, 18 Jul 2023 15:44:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvk-0001Lu-KU; Tue, 18 Jul 2023 10:44:00 -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 1qLluv-0000kz-H7 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 1qLlur-00017K-D2 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 1qLlur-0006l3-9p for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 35/43] gnu: graphite2: Skip test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:05 +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.168969135625788 (code B ref 64711); Tue, 18 Jul 2023 14:43:05 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:36 +0000 Received: from localhost ([127.0.0.1]:53890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluO-0006hr-Cz for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluM-0006hN-Uy for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:35 -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 1qLluH-0000zw-Ej; Tue, 18 Jul 2023 10:42:29 -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=x1/2gH8t0sPq3FE6b8LXqeX2SGpeAA8eqBneZCxqThM=; b=F+Czwsz/lumdXW5LIi9J u3rXdav2rSIWpYtB0wveTF/CW1FCGm/C9esPe0MF0NDxNEPwq6OMmZYqqq5UvI5+rROlf92TCxWWk JnI+N5dvufrJ9gdYiQbTvSifeaQbgnMWUdmg6WUx+5Y4HM0FhsMi/nIf8RA7Nk4oth6W0IuTfUjvB /wFfIM94eMUdSad8/01rcaRwdgGaX3JE9rLZ3n6NxiWEMVZl9zXt1CiymNH1+uFD1EVU/KsBVDyMX sSIgVBWmEvS+bwN1WpzHLH88YSulF+uoInR+NWJU0gyyrK/2Mbni1Pi+leL9CUmB9xIFLD8F2A69p eydc1EG7c0Bqiw==; 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 1qLlu3-0004hp-P5; Tue, 18 Jul 2023 10:42:20 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:28 +0200 Message-Id: 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/fontutils.scm (graphite2)[arguments]: When building natively on the Hurd, replace phase 'check' to set make-flags to skip "awamicmp3" test. --- gnu/packages/fontutils.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index e5170b5ae3..64b15fbf05 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2022 Felipe Balbi ;;; Copyright © 2023 gemmaro ;;; Copyright © 2023 John Kehayias +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1369,6 +1370,25 @@ (define-public graphite2 (list python python-fonttools-minimal)) (inputs (list freetype)) + (arguments + (if (system-hurd?) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + ;; cmake-build-system ignores #:make-flags for make check + (lambda* (#:key test-target tests? parallel-tests? + #:allow-other-keys) + (if tests? + (let ((jobs (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) + (invoke "make" + (string-append + "ARGS=-j " jobs " --exclude-regex ^awamicmp3$") + test-target)) + (format #t "test suite not run~%")))))) + '())) (synopsis "Reimplementation of the SIL Graphite text processing engine") (description "Graphite2 is a reimplementation of the SIL Graphite text processing From patchwork Tue Jul 18 14:40:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51823 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 3E4A227BBEA; Tue, 18 Jul 2023 15:44:21 +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 A6C8627BBE2 for ; Tue, 18 Jul 2023 15:44:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvk-0001Lt-LS; Tue, 18 Jul 2023 10:44:00 -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 1qLluv-0000kx-Gp 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 1qLlur-00017M-S1 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 1qLlur-0006lB-OO for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 36/43] gnu: guile-git: Skip http proxy test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:05 +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.168969135925807 (code B ref 64711); Tue, 18 Jul 2023 14:43:05 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:39 +0000 Received: from localhost ([127.0.0.1]:53897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluQ-0006i9-NX for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluN-0006hO-PU for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:36 -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 1qLluI-00010S-Ho; Tue, 18 Jul 2023 10:42:30 -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=IISp9aZFD4nAyB7aBPs0HF6TV9RxllO+4EBmlKyfgTM=; b=aV8pcFDHvDY4uJGRnz+B fzip1l+C+MZ3mMZac4c5k3axu8O5oRjwL1El1Fg2/WWB4CCUmbc1IYP3sQJc3mTL7aOXoozCIM+2G A4ZwyhZEuep4YienDW84p/TQy6J+A5By+ObtWZgDzCB6GN4GZqN6lXV5waNKIBhX7NrpE6VjoOG4d AKIIUK7dtD5yWatH6Wx/BB+iGmeSJJJ0wRY/x6wF07cCTvlaQcQvj0x95jiGcaX9AvI2Ln6z8kXT6 jPNMDp9oLmBIyzPLLqKHtTKo+z2TexrS7vPjsR+nhVSO7/RNEWNlj89g/JAsFjT38733Eyk/Wobmx 3+sKGy7uzwt7jg==; 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 1qLluH-0004hp-OL; Tue, 18 Jul 2023 10:42:30 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:29 +0200 Message-Id: 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/guile.scm (guile-git)[arguments]: When building natively on the Hurd, add phase 'skip-tests/hurd'. --- gnu/packages/guile.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index ed20c1dfbc..e9bed75fb1 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -838,7 +838,20 @@ (define-public guile-git (lambda _ (substitute* "Makefile.am" ((".*tests/blob\\.scm.*") "")))))) - '()))) + '()) + ,@(if (system-hurd?) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-tests/hurd + (lambda _ + (substitute* "tests/proxy.scm" + (("\\(test-begin.*" all) + (string-append + all + "(when (string-ci= \"GNU\" (vector-ref (uname) 0))\n" + " (test-skip 1))\n"))))))) + '()))) (native-inputs (list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures)) (inputs From patchwork Tue Jul 18 14:40:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51834 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 2671627BBE2; Tue, 18 Jul 2023 15:45:26 +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 6A9B527BBEA for ; Tue, 18 Jul 2023 15:45:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvn-0001ec-JV; Tue, 18 Jul 2023 10:44:03 -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 1qLluv-0000ky-Gj 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 1qLlus-00017W-8u 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 1qLlus-0006lI-3z; Tue, 18 Jul 2023 10:43:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 37/43] gnu: glib: Disable tests for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:06 +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 Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969136025819 (code B ref 64711); Tue, 18 Jul 2023 14:43:06 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:40 +0000 Received: from localhost ([127.0.0.1]:53899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluR-0006iC-4z for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluP-0006hY-1K for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:37 -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 1qLluJ-00010v-Q9; Tue, 18 Jul 2023 10:42:31 -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=ZVA0L15Hcx8XjOvW+WViqF+3+WhRIjUP3a6pvsS1bYo=; b=AwrMV6+xbVfsU/WgF9dm yeomeUFw5cDBq0hZZ+IDjn9xNcXGOXsn5Hw5yEn0vUIVAVl0QOvE1QgLYUkmC9xTuPeSw94tibPRp DiYxrP3OGQGWVSbRclJNpLPqhfV3MGayur+Q6XIXVrU8SEzvIEvnGSrJsksY+3B8VtKXdO9gKKCBE HAqBILtigK1YGIivVCCkJKWu9mbgPmF0uj8Zq+6i0vzi4p9vIJQpe7xBGxVHueJOC8X0hHxSvUho9 bzdCTEY4S3LxyywpLuiaseyZpxssAJuZo6L3tmjEZ3AC3gfDIJXeGYxBwjl2kmCnRq+aqQcpjm1zx 89yqEYC757wWKg==; 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 1qLluJ-0004hp-6I; Tue, 18 Jul 2023 10:42:31 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:30 +0200 Message-Id: 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/glib.scm (glib)[arguments]: When building for the Hurd, set #:tests? to #false. --- gnu/packages/glib.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e988e8dc87..bcbc1f22b1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Florian Pelz -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Arthur Margerit ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Petr Hodina @@ -241,6 +241,7 @@ (define glib "debug")) (arguments (list + #:tests? (not (target-hurd?)) #:disallowed-references (cons tzdata-for-tests ;; Verify glib-mkenums, gtester, ... use the cross-compiled From patchwork Tue Jul 18 14:40:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51822 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 46ED027BBE2; Tue, 18 Jul 2023 15:44:11 +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=unavailable 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 CF6BF27BBEC for ; Tue, 18 Jul 2023 15:44:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvg-00019L-6W; Tue, 18 Jul 2023 10:43:56 -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 1qLluv-0000l0-HI 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 1qLlus-00017u-L0 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 1qLlus-0006lQ-II for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 38/43] gnu: ghostscript: 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:06 +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.168969136425848 (code B ref 64711); Tue, 18 Jul 2023 14:43:06 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:44 +0000 Received: from localhost ([127.0.0.1]:53907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluV-0006io-TO for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluQ-0006hb-H5 for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:39 -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 1qLluL-00011A-5Z; Tue, 18 Jul 2023 10:42:33 -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=xSbhGfeiuIsXF71SnK7iGthnenLuvYaM6OEwt+lOzfw=; b=J0lmIAqmhPtP+JOdkMNG OcwTvNlTCYDbo+CQrBeD/CXl1Vk+hCASFEHKXhE0zYw+zxiSOr2sGjYfatxucsTuPn+xwCJjAdM8q TBKlXU3iOa5gAo7T7w4oI1/hoszSMxQWhMCSQaXsQCFZWgd0BHmZOuLS3JI+KBX/W6F8MrLeRBFmm XPuOcCMofjjOHLxDAb0t5mxE0l+K/6GleMsIkUCxx4nE6OIxhWD5ZSBE8oAHsJ3xLQr/yIb25Hr6f ltYDkNzk2zDLwmsZjhB4aWtWweQa0Nb9YBws+tO10YOvE1YuSq22Drzh6l7URLhnTJc7lX2muJNXy PF/6i0O3damYww==; 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 1qLluK-0004hp-D7; Tue, 18 Jul 2023 10:42:32 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:31 +0200 Message-Id: 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/patches/ghostscript-leptonica-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ghostscript.scm (ghostscript)[arguments]: When building for the Hurd, add phase 'patch-leptonica' and use it. --- gnu/local.mk | 3 +- gnu/packages/ghostscript.scm | 10 +++ .../patches/ghostscript-leptonica-hurd.patch | 78 +++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/ghostscript-leptonica-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index 84c4167723..45b1c1356b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1238,8 +1238,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-bloomfilter-ghc9.2.patch \ %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \ - %D%/packages/patches/ghostscript-CVE-2023-36664.patch \ - %D%/packages/patches/ghostscript-CVE-2023-36664-fixup.patch \ + %D%/packages/patches/ghostscript-leptonica-hurd.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 94807fdd94..2d7f07fb40 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -201,6 +201,16 @@ (define-public ghostscript '())) #:phases #~(modify-phases %standard-phases + #$@(if (target-hurd?) + #~((add-after 'unpack 'patch-leptonica + (lambda _ + (let ((patch-file + #$(local-file + (search-patch + "ghostscript-leptonica-hurd.patch")))) + (with-directory-excursion "leptonica" + (invoke "patch" "--force" "-p1" "-i" patch-file)))))) + #~()) (add-before 'configure 'create-output-directory (lambda _ ;; The configure script refuses to function if the directory diff --git a/gnu/packages/patches/ghostscript-leptonica-hurd.patch b/gnu/packages/patches/ghostscript-leptonica-hurd.patch new file mode 100644 index 0000000000..124365b3e6 --- /dev/null +++ b/gnu/packages/patches/ghostscript-leptonica-hurd.patch @@ -0,0 +1,78 @@ +Upstream status: This patch was taken from leptonica upstream. + +Backported to ghostscripts bundled leptonica. + +From f04da7c816feb1d5f689c34f3d0e7e3621edf1f5 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Wed, 1 Feb 2023 19:35:43 +0100 +Subject: [PATCH] Fix GNU/Hurd build + +There is no PATH_MAX limitation on GNU/Hurd, and realpath() can be +safely be used with its second parameter set to NULL (as required by +posix since its version 2001). +--- + src/sarray1.c | 29 +++++++++++++++++++++++------ + 1 file changed, 23 insertions(+), 6 deletions(-) + +--- a/src/sarray1.c 2023-06-13 12:31:13.393672916 +0200 ++++ a/src/sarray1.c 2023-06-13 12:34:13.574237149 +0200 +@@ -1953,7 +1953,11 @@ + SARRAY * + getFilenamesInDirectory(const char *dirname) + { ++#if _POSIX_VERSION >= 200112 || defined(__GLIBC__) ++char *dir; ++#else + char dir[PATH_MAX + 1]; ++#endif + char *realdir, *stat_path, *ignore; + size_t size; + SARRAY *safiles; +@@ -1976,17 +1980,28 @@ + * If the file or directory exists, realpath returns its path; + else it returns NULL. + * If the second arg to realpath is passed in, the canonical path +- is returned there. Use a buffer of sufficient size. If the +- second arg is NULL, the path is malloc'd and returned if the +- file or directory exists. +- We pass in a buffer for the second arg, and check that the canonical +- directory path was made. The existence of the directory is checked +- later, after its actual path is returned by genPathname(). */ ++ is returned there. Use a buffer of sufficient size. ++ We pass in a buffer for the second arg, and check that the ++ canonical directory path was made. The existence of the ++ directory is checked later, after its actual path is returned by ++ genPathname(). ++ With GNU libc or Posix 2001, if the second arg is NULL, the path ++ is malloc'd and returned if the file or directory exists. ++ */ ++#if _POSIX_VERSION >= 200112 || defined(__GLIBC__) ++ dir = realpath(dirname, NULL); ++ if (dir == NULL) ++ return (SARRAY *)ERROR_PTR("dir not made", __func__, NULL); ++#else + dir[0] = '\0'; /* init empty in case realpath() fails to write it */ + ignore = realpath(dirname, dir); + if (dir[0] == '\0') + return (SARRAY *)ERROR_PTR("dir not made", procName, NULL); ++#endif + realdir = genPathname(dir, NULL); ++#if _POSIX_VERSION >= 200112 || defined(__GLIBC__) ++ LEPT_FREE(dir); ++#endif + if ((pdir = opendir(realdir)) == NULL) { + LEPT_FREE(realdir); + return (SARRAY *)ERROR_PTR("pdir not opened", procName, NULL); +@@ -1998,10 +2013,12 @@ + stat_ret = fstatat(dfd, pdirentry->d_name, &st, 0); + #else + size = strlen(realdir) + strlen(pdirentry->d_name) + 2; ++#if _POSIX_VERSION < 200112 && !defined(__GLIBC__) + if (size > PATH_MAX) { + L_ERROR("size = %zu too large; skipping\n", procName, size); + continue; + } ++#endif + stat_path = (char *)LEPT_CALLOC(size, 1); + snprintf(stat_path, size, "%s/%s", realdir, pdirentry->d_name); + stat_ret = stat(stat_path, &st); From patchwork Tue Jul 18 14:40:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51832 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 1D2A427BBEC; Tue, 18 Jul 2023 15:45:23 +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 9F8D227BBEA for ; Tue, 18 Jul 2023 15:45:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvm-0001ZX-SF; Tue, 18 Jul 2023 10:44:03 -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 1qLluw-0000l6-BS 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 1qLlut-000191-29 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlus-0006lY-UF; Tue, 18 Jul 2023 10:43:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 39/43] gnu: harfbuzz: Support build for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:06 +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 Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969136425855 (code B ref 64711); Tue, 18 Jul 2023 14:43:06 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:44 +0000 Received: from localhost ([127.0.0.1]:53909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluW-0006ir-GS for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluR-0006hc-Bs for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:40 -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 1qLluM-00011N-0m; Tue, 18 Jul 2023 10:42:34 -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=skzliisRpA04QCpm1mB0exnCRGZx+Sx4KQbKZIwRxtE=; b=O8Py1PDy1KcLREkKRRle Mbi6HBbf6EYrCTKlPYn5+UcUT0NcVh1mEyQMBwvCflKBMwNBs2LA8dYRZvyj8y4dFAbuismpHhFIW +EuU+JcgYYKY+9NAUBwaINDNSD1Lr6uQmt1ioDjZUhcNii/KyBWPfxbE1jajjr6u7rwgdukDd9NlJ h9sYwAsL9I/eClph6JCcNjmXd3PcStU+vDLF/Gm7OY0VeNdMpF5VFrr1CPzdca9D8y+992pC34Tc0 TozzRHQ943Q9MiEC3qNT0qWLgK90sDYk3RYx6RMDGoBugCBHc0RBjBPCApxYurbbe9PPEVQEeStO7 giMu6M56qbSxZA==; 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 1qLluL-0004hp-IQ; Tue, 18 Jul 2023 10:42:33 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:32 +0200 Message-Id: <9fc9a0ae11de8c4484558c0cbac047330ca909f6.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/gtk.scm (harfbuzz)[native-inputs]: Do not include gobject-introspection when building for the Hurd. --- gnu/packages/gtk.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index eb69a88221..853696c7f5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -276,11 +276,13 @@ (define-public harfbuzz ;; There are all in the Requires or Requires.private field of '.pc'. (list glib graphite2 icu4c)) (native-inputs - (list `(,glib "bin") ;for glib-mkenums - gobject-introspection - pkg-config - python-wrapper - which)) + `((,glib "bin") ;for glib-mkenums + ,@(if (target-hurd?) + '() + (list gobject-introspection)) + ,pkg-config + ,python-wrapper + ,which)) (arguments (list #:configure-flags #~(list "--with-graphite2" From patchwork Tue Jul 18 14:40:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51835 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 6D6A027BBE2; Tue, 18 Jul 2023 15:45:27 +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 A180027BBED for ; Tue, 18 Jul 2023 15:45:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvl-0001Tf-Rk; Tue, 18 Jul 2023 10:44:01 -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 1qLluw-0000l5-7s 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 1qLlut-000199-FF for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlut-0006lg-BU; Tue, 18 Jul 2023 10:43:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 40/43] gnu: pango: Support build for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:07 +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 Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969136525862 (code B ref 64711); Tue, 18 Jul 2023 14:43:07 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:45 +0000 Received: from localhost ([127.0.0.1]:53911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluW-0006iy-Qd for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluS-0006he-4x for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:40 -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 1qLluM-000123-Tw; Tue, 18 Jul 2023 10:42:34 -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=1XTw5lwn6j3zzoqpm7ZUwKBx8ZsP4Og8+GcHcBTGCAw=; b=Zq2oEC9qr1v1cp9895GT O3ilh52rsOkUsfhSs+SDpuNK1XjPczNqr9x6nf98zYhV4QoQJpLJZYpY9KqfgPAQf7zSTqJjPvLJw y8pktOxKTdyr+xoqeRfU94T7m8D0DmspgJiDILjOy8bIPpS/08g7xYzCmj85YpvrRy5dBz8LBQvk1 h0rDc8FYeZwNk82kMUIJy3lW/xrmBqi4E55uHyMiaye66ZvB7nbocgMY15XgVVO1eECNz2bmR8WR3 toujnLnl2135KPJHGCvnIdwSTtRx8toVzNrfYGmqxB+E+95bt8aRAeW5ox4KMsDz3GupF2WYYdYrB RSiE/Q+9EPLS5A==; 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 1qLluM-0004hp-Dj; Tue, 18 Jul 2023 10:42:34 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:33 +0200 Message-Id: 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/gtk.scm (pango)[native-inputs]: Do not include gobject-introspection when building for the Hurd. --- gnu/packages/gtk.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 853696c7f5..15dea2852b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -401,12 +401,14 @@ (define-public pango (list bash-minimal zlib)) (native-inputs - (list `(,glib "bin") ;glib-mkenums, etc. - gobject-introspection ;g-ir-compiler, etc. - help2man - perl - pkg-config - python-wrapper)) + `((,glib "bin") ;glib-mkenums, etc. + ,@(if (target-hurd?) + '() + (list gobject-introspection)) ;g-ir-compiler, etc. + ,help2man + ,perl + ,pkg-config + ,python-wrapper)) (synopsis "Text and font handling library") (description "Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text From patchwork Tue Jul 18 14:40:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51833 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 7C8EE27BBEE; Tue, 18 Jul 2023 15:45:25 +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 8D27227BBE2 for ; Tue, 18 Jul 2023 15:45:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvm-0001W9-8k; 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 1qLluw-0000l8-DM for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:13 -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 1qLlut-00019b-SB for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlut-0006lo-OU for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 41/43] gnu: fontforge: Support build on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:07 +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.168969136525869 (code B ref 64711); Tue, 18 Jul 2023 14:43:07 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:45 +0000 Received: from localhost ([127.0.0.1]:53913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluX-0006j5-4x for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluS-0006hl-Uy for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:41 -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 1qLluN-00012K-Nt; Tue, 18 Jul 2023 10:42:35 -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=3q+qw8HK2VZ08Rxf5BxSv9HnQIW+HwJFY3cV1FMqi9A=; b=nfWhxK5bO/RK1bCYmhWI jhlPshtlnOsGarymawXAVL1BMfijaHSsP9c/Se/tjFmWXVKWamEmprHhFWUN+kKgAdiSS81Wedela kTFO3zxJMVrbRNnDWfs7bF95NcNYKUmZ+5VfpTFzvhrd6O0tPt9NNTFTl9p7iEjkN9weHZK7UsR/s HAn8OigVA2FA7aDUG6IyVhBl9BISCmWF98AF5re2yigsrWRrg4v+6azzXcz5rdFqzwBe4Ix6MEiu7 KsdN0VyBzCLCy2zUvPFcKA1Y1XBYp/NSQvFr4PjaoamGv5OvlLx3TQYXhW7366gQl9b2Ba+JQcL9S X/UVzy9v9CjmrA==; 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 1qLluN-0004hp-Bc; Tue, 18 Jul 2023 10:42:35 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:34 +0200 Message-Id: <9e077daf4be3ff7e412008ab06ae801bbd4c030c.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/patches/fontforge-hurd.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/fontutils.scm (fontforge)[arguments]: When building natively on the Hurd, add new phase 'apply-hurd-patch' and use it, and replace phase 'check' to skip two tests. --- gnu/local.mk | 1 + gnu/packages/fontutils.scm | 88 +++++++++++++++-------- gnu/packages/patches/fontforge-hurd.patch | 82 +++++++++++++++++++++ 3 files changed, 141 insertions(+), 30 deletions(-) create mode 100644 gnu/packages/patches/fontforge-hurd.patch diff --git a/gnu/local.mk b/gnu/local.mk index 45b1c1356b..5befa67e6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1147,6 +1147,7 @@ dist_patch_DATA = \ %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \ %D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch \ %D%/packages/patches/fontconfig-cache-ignore-mtime.patch \ + %D%/packages/patches/fontforge-hurd.patch \ %D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 64b15fbf05..2cfaa45c37 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1534,37 +1534,65 @@ (define-public fontforge ("python" ,python) ("zlib" ,zlib))) (arguments - '(#:configure-flags '(;; TODO: Provide GTK+ for the Wayland-friendly GDK - ;; backend, instead of the legacy X11 backend. - ;; Currently it introduces a circular dependency. - "-DENABLE_X11=ON") + (list + #:configure-flags #~'( ;; TODO: Provide GTK+ for the Wayland-friendly GDK + ;; backend, instead of the legacy X11 backend. + ;; Currently it introduces a circular dependency. + "-DENABLE_X11=ON") #:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-override-RPATH - (lambda _ - ;; Do not attempt to set a default RPATH, as our ld-wrapper - ;; already does the right thing. - (substitute* "CMakeLists.txt" - (("^set_default_rpath\\(\\)") - "")) - #t)) - (add-after 'install 'set-library-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (potrace (dirname - (search-input-file inputs "bin/potrace")))) - (wrap-program (string-append out "/bin/fontforge") - ;; Fontforge dynamically opens libraries. - `("LD_LIBRARY_PATH" ":" prefix - ,(map (lambda (input) - (string-append (assoc-ref inputs input) - "/lib")) - '("libtiff" "libjpeg" "libpng" "libungif" - "libxml2" "zlib" "libspiro" "freetype" - "pango" "cairo" "fontconfig"))) - ;; Checks for potrace program at runtime - `("PATH" ":" prefix (,potrace))) - #t)))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-override-RPATH + (lambda _ + ;; Do not attempt to set a default RPATH, as our ld-wrapper + ;; already does the right thing. + (substitute* "CMakeLists.txt" + (("^set_default_rpath\\(\\)") + "")) + #t)) + #$@(if (target-hurd?) + #~((add-after 'unpack 'apply-hurd-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "fontforge-hurd.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file))))) + #~()) + #$@(if (system-hurd?) + #~((replace 'check + ;; cmake-build-system ignores #:make-flags for make check + (lambda* (#:key test-target tests? parallel-tests? + #:allow-other-keys) + (let ((skip '("test0001_py" "test0001_pyhook"))) + (if tests? + (let ((jobs + (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) + (invoke "make" + (string-append "ARGS=-j " jobs + " --exclude-regex ^" + (string-join skip "\\|") + "$") + test-target)) + (format #t "test suite not run~%")))))) + #~()) + (add-after 'install 'set-library-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (potrace (dirname + (search-input-file inputs "bin/potrace")))) + (wrap-program (string-append out "/bin/fontforge") + ;; Fontforge dynamically opens libraries. + `("LD_LIBRARY_PATH" ":" prefix + ,(map (lambda (input) + (string-append (assoc-ref inputs input) + "/lib")) + '("libtiff" "libjpeg" "libpng" "libungif" + "libxml2" "zlib" "libspiro" "freetype" + "pango" "cairo" "fontconfig"))) + ;; Checks for potrace program at runtime + `("PATH" ":" prefix (,potrace))) + #t)))))) (synopsis "Outline font editor") (description "FontForge allows you to create and modify postscript, truetype and diff --git a/gnu/packages/patches/fontforge-hurd.patch b/gnu/packages/patches/fontforge-hurd.patch new file mode 100644 index 0000000000..20d62b8ce2 --- /dev/null +++ b/gnu/packages/patches/fontforge-hurd.patch @@ -0,0 +1,82 @@ +Upstream status: Taken from upstream. + +From dca87c025665f0f010f906a4eba96da9794a4d04 Mon Sep 17 00:00:00 2001 +From: Anthony Fok +Date: Thu, 16 Jun 2022 02:40:23 -0600 +Subject: [PATCH] Define PATH_MAX and MAXPATHLEN for GNU/Hurd compatibility + +Special thanks to @henrich, @ucko and @kilobyte for reporting the issue +and offering suggestions on a fix. + +See also https://bugs.debian.org/877795 + +Fixes #3119 +--- + inc/basics.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/inc/basics.h b/inc/basics.h +index b8d65823b..14590c5b1 100644 +--- a/inc/basics.h ++++ b/inc/basics.h +@@ -123,5 +123,13 @@ static inline int imax(int a, int b) + last = newitem; \ + } + ++#ifdef __GNU__ ++# ifndef PATH_MAX ++# define PATH_MAX 4096 ++# endif ++# ifndef MAXPATHLEN ++# define MAXPATHLEN 4096 ++# endif ++#endif + + #endif /* FONTFORGE_BASICS_H */ +-- +2.40.1 + +From e0480f143f27f8f2686b5b14d7d302fe22f35002 Mon Sep 17 00:00:00 2001 +From: Anthony Fok +Date: Thu, 16 Jun 2022 03:06:56 -0600 +Subject: [PATCH] Undefine "extended" macro temporarily on GNU Hurd + +GNU Mach microkernel header files (gnumach-dev 1.8+git20201129) added to +struct i386_xfp_save in /usr/include/i386-gnu/include/mach/i386/fp_reg.h +a new "extended" field which happens to collide with the macro definition +"#define extended double" in FontForge, leading to FTBFS on GNU Hurd. + +This issue may be circumvented by temporarily undefining the "extended" +macro before loading `` and friends, and redefining the +"extended" macro right after. +--- + inc/ffglib.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/inc/ffglib.h b/inc/ffglib.h +index f3419f0ab..25fe9ebde 100644 +--- a/inc/ffglib.h ++++ b/inc/ffglib.h +@@ -26,11 +26,19 @@ + #define GMenuItem GMenuItem_GIO + #define GTimer GTimer_GTK + ++#ifdef __GNU__ ++# undef extended ++#endif ++ + #include + #include + #include + #include + ++#ifdef __GNU__ ++# define extended double ++#endif ++ + #undef GList + #undef GMenuItem + #undef GTimer +-- +2.40.1 + From patchwork Tue Jul 18 14:40:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51820 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 0EC2527BBE2; Tue, 18 Jul 2023 15:44:08 +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 78E3227BBF5 for ; Tue, 18 Jul 2023 15:44:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlva-0000z7-QB; Tue, 18 Jul 2023 10:43:53 -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 1qLluw-0000l7-Cn for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:13 -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 1qLluu-00019d-CX for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLluu-0006ly-8z for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 42/43] gnu: po4a: Skip failing test on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:08 +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.168969137625906 (code B ref 64711); Tue, 18 Jul 2023 14:43:08 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:56 +0000 Received: from localhost ([127.0.0.1]:53919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluh-0006jh-Ps for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlug-0006jN-13 for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:54 -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 1qLlua-00014b-Pr; Tue, 18 Jul 2023 10:42:48 -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=9HF2vX9YNNOLebOvEJkYK4y5kKJMFhL4ec3nFGOuLag=; b=ZiDXoiZt2rfY05kkjcDx RSiiYpOBGZ4Zm0VC+/HNh0ji9yeTWOTwrebRL1e4L8KAlGRzRr4eaPQhHnHNLyw3kuWm/5ey3avuf rS1LHwM8gNc7HGZIVuD/bZmKwUDf3vR36PeurHBhGW6trXbK7M8KzKIlv4MyLsZxGbdZYsUAPYBSg CXgn5YWxiy5EYV6Clq3rKi6tkdrCFRL50jT06hU8RWxAH/JoQGwleKPYwTEa6FbFprbtOREoLEMoX QsaHiba70MhMea33Mq3QNkgYOpm7mKb5Wla9fNEliH4ZltILou3KZONHptBlTG9ZjIECBWTIoXgsN eJ544BhRz2igHQ==; 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 1qLluO-0004hp-5V; Tue, 18 Jul 2023 10:42:39 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:35 +0200 Message-Id: <7077d91e7b9a284c85a4677a059a767095509639.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/gettext.scm (po4a)[arguments]: When building natively on the Hurd, add phase 'skip-tests/hurd'. --- gnu/packages/gettext.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 0cb01154d3..99a4d4edbc 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -279,7 +279,14 @@ (define-public po4a (add-before 'check 'disable-failing-tests (lambda _ ;; FIXME: fails despite of importing SGMLS - (delete-file "t/fmt-sgml.t")))))) + (delete-file "t/fmt-sgml.t"))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'skip-tests/hurd + (lambda _ + (delete-file "t/cfg-multi.t") + (delete-file "t/cfg-single.t") + (delete-file "t/cfg-split.t")))) + #~())))) (native-inputs (list gettext-minimal perl-module-build From patchwork Tue Jul 18 14:40:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51828 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 8A0BA27BBE9; Tue, 18 Jul 2023 15:45:15 +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=unavailable 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 0D45827BBE2 for ; Tue, 18 Jul 2023 15:45:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvl-0001Rd-9u; Tue, 18 Jul 2023 10:44:01 -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 1qLluw-0000l9-Dh for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:13 -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 1qLluu-00019g-PL for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLluu-0006m5-Lo for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 43/43] gnu: guile-2.0: Skip failing tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:08 +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.168969137825915 (code B ref 64711); Tue, 18 Jul 2023 14:43:08 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:58 +0000 Received: from localhost ([127.0.0.1]:53921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluk-0006jv-7p for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluh-0006jT-LB for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:56 -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 1qLluc-000156-EF; Tue, 18 Jul 2023 10:42:50 -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=iO37Tbcsug91AOXMOW1Yc8S4rf6iAGy3PfT1vcIGwHI=; b=aRWkqeGvmEOmhlg3+5Cj U42AiPER4w6m55B18jDX5rg0VwdliCj/XYjSldAOEu9FiKvVlDec9i0hgRT/ojTpXvlnNuSj+akzI AbG+H0KuX2Qfkzwlcxnr6Y+WgelHGzy0MkWKCIMPgf2//LDc3evdX2QdkD5baS4pq7+XiHH2aKKPQ 74nGqGxbjcjtgOcxd/0Xk55/zRKVYkZkf6TX4AUxHO6BIPdxXUOmV0NNDdn8DEZ82xTCPNAnIxi7+ UseoqZFnIGiSJGHWGYTEiqleWHBMKZGQY9QcY6tqFPilfgEwKRbmRTjZj45zJ9CJdLT/NsD1tJAf2 /Nf7hM5M66aKFg==; 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 1qLlub-0004hp-9q; Tue, 18 Jul 2023 10:42:50 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:36 +0200 Message-Id: <0e04074adec5abd0d5c621c7d2853326dc9f2e56.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/guile.scm (guile-2.0)[arguments]: When building natively on the Hurd, add stage 'disable-threads.tests'... (guile-2.2): ...and when building natively on the Hurd, delete it again. --- gnu/packages/guile.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index e9bed75fb1..9aefead3b3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -212,8 +212,13 @@ (define-public guile-2.0 (rename-file "test-suite/tests/srfi-18.test" "srfi-18.test") ;; failed to remove 't-guild-compile-7215.go.tdL7yC (substitute* "test-suite/standalone/Makefile.in" - (("test-guild-compile ") "")) - #t))) + (("test-guild-compile ") ""))))) + '()) + ,@(if (system-hurd?) + '((add-after 'unpack 'disable-threads.tests + (lambda _ + ;; Many tests hang, esp. (join-thread ..), also others. + (rename-file "test-suite/tests/threads.test" "threads.test")))) '()) (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) @@ -286,7 +291,12 @@ (define-public guile-2.2 (if (target-x86-32?) ; `(append '("--disable-static") '("CFLAGS=-g -O2 -fexcess-precision=standard")) - flags)))) + flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + #$@(if (system-hurd?) + #~((delete 'disable-threads.tests)) + '()))))) (properties '((timeout . 72000) ;20 hours (max-silent-time . 36000))) ;10 hours (needed on ARM