From patchwork Tue Feb 28 17:38:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 47494 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 736C216C4F; Tue, 28 Feb 2023 17:40:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=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 C3A4216C32 for ; Tue, 28 Feb 2023 17:40:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX3xp-0001IZ-HW; Tue, 28 Feb 2023 12:40:34 -0500 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 1pX3xf-0001DF-Kk for guix-patches@gnu.org; Tue, 28 Feb 2023 12:40:24 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX3xV-0001dr-1L; Tue, 28 Feb 2023 12:40:15 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pX3xK-0006vH-J7; Tue, 28 Feb 2023 12:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61873] [PATCH core-updates] gnu: libgc: Update to 8.2.2 and remove '--disable-munmap'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: whatson@tailcall.au, andreas@enge.fr, mail@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 28 Feb 2023 17:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61873@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Andrew Whatson , Andreas Enge , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Whatson , Andreas Enge , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.167760596026551 (code B ref -1); Tue, 28 Feb 2023 17:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Feb 2023 17:39:20 +0000 Received: from localhost ([127.0.0.1]:51938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pX3wb-0006u8-5F for submit@debbugs.gnu.org; Tue, 28 Feb 2023 12:39:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:36860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pX3wW-0006tt-AU for submit@debbugs.gnu.org; Tue, 28 Feb 2023 12:39:15 -0500 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 1pX3wV-00007u-4V for guix-patches@gnu.org; Tue, 28 Feb 2023 12:39:12 -0500 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 1pX3wN-0001Ji-AT; Tue, 28 Feb 2023 12:39:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=DskgGtcoREawGdAGvzf78UwwbIEJY8S1blnB7JugkXk=; b=Sxqe/g+H3zWYbL XmIAURUvzX0b70iFZUnx6w4W2SW6rHzDHN9lwsM2cXBE1CEjRz6CaTqHQn8nVy2IPfszHlLuBGy84 Y00cxBDRwCNBKXY4GZfHcvPbcPywn97d9VGelbqMJPOyocx22VV2BlUBv7v8Zl8SRwfXXLhyXbIE9 YPIvjlkeFq/rmxppHhEpTkC7qsgDg6foHOsI/ksoEzYfx+6keiYxm2TrEoAfww00CDM46YB5ZNbwq YdiRU/Az9jkqv+xaZlKOtPzsdjP39rCKXnz4hXd7IHZdQgFSgsL4U4v8XC2/ZG3wG0hZT2Ju9dR8r CixVRAADAc/ZT2cFUxgw==; Received: from [193.50.110.164] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX3wM-00029T-G3; Tue, 28 Feb 2023 12:39:02 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 28 Feb 2023 18:38:54 +0100 Message-Id: <20230228173854.25132-1-ludo@gnu.org> X-Mailer: git-send-email 2.39.1 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/bdw-gc.scm (libgc): Update to 8.2.2. [arguments]: Remove "--disable-munmap" from #:configure-flags. * gnu/packages/guile.scm (guile-3.0)[source]: Leave 'test-out-of-memory' test untouched. (guile-next)[arguments]: Likewise, in 'skip-failing-tests' phase. (guile-for-guile-emacs)[arguments]: Likewise, in 'bootstrap' phase. --- gnu/packages/bdw-gc.scm | 9 +++------ gnu/packages/guile.scm | 16 +++------------- 2 files changed, 6 insertions(+), 19 deletions(-) Hello Guix! This is another proposal for a world-rebuild change, hopefully the latest (I swear!). It’s quite important because it fixes a libgc bug that led us to build libgc with ‘--disable-munmap’, meaning it would not return memory to the OS: https://github.com/ivmai/bdwgc/issues/353 Thanks to Andrew Whatson for tackling this and for letting me know! I tested on x86_64-linux on top of 4895846197bd445dd68c832364c667dea4337f8c like so: --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix build guix guile@2.2 guile@2.0 -nguix build: warning: ambiguous package specification `guile@2.2' guix build: warning: choosing guile@2.2.7 from gnu/packages/guile.scm:253:2 /gnu/store/4nhq6kmqcfk2qnzhi4xifbb0zjav0f01-guile-2.0.14-debug /gnu/store/4p1l5bdxxbyyqc3wh0d07jv9rp1pdcy7-guile-2.0.14 /gnu/store/k47958rhcrk176i9sabxda2rgmnlig4c-guile-2.2.7-debug /gnu/store/ka0v3fk21lqrnwj4fzbf8z154mpbnjvx-guile-2.2.7 /gnu/store/agrv086cfa0a5f9cmj94k9zgwi1a08q6-guix-1.4.0-3.d5fece6 --8<---------------cut here---------------end--------------->8--- Given that the test suite of Guix passed and that everything in between went fine, I’m rather confident. Thoughts? Ludo’. base-commit: 4895846197bd445dd68c832364c667dea4337f8c diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index cfa037dec0..86caa62d7e 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020, 2021 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020, 2021, 2023 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016, 2018 Leo Famulari ;;; Copyright © 2017 Rene Saavedra @@ -34,14 +34,14 @@ (define-module (gnu packages bdw-gc) (define-public libgc (package (name "libgc") - (version "8.0.6") + (version "8.2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/ivmai/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "04ga3c95w5az5sznzm73j19lvvfpf6k4sgkpjqsmjxpsr6mi8j9v")))) + "181ni2rn9qjbl4ilqdjrd1a4h8siv5bgmzqgg4595q32n2y0f0gk")))) (build-system gnu-build-system) (arguments (list @@ -50,9 +50,6 @@ (define-public libgc ;; Install gc_cpp.h et al. "--enable-cplusplus" - ;; Work around . - "--disable-munmap" - ;; In GNU/Hurd systems during the 'check' phase, ;; there is a deadlock caused by the 'gctest' test. ;; To disable the error set "--disable-gcj-support" diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c2ffbefeec..64a815dbd4 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -325,11 +325,8 @@ (define-public guile-3.0 (patches '()) ;; Replace the snippet because the oom-test still ;; fails on some 32-bit architectures. - (snippet '(begin - (substitute* "test-suite/standalone/Makefile.in" - (("test-out-of-memory") "")) - (for-each delete-file - (find-files "prebuilt" "\\.go$")))))) + (snippet '(for-each delete-file + (find-files "prebuilt" "\\.go$"))))) ;; Build with the bundled mini-GMP to avoid interference with GnuTLS' own ;; use of GMP via Nettle: . @@ -444,10 +441,7 @@ (define-public guile-next (display ,version port))))) (add-before 'check 'skip-failing-tests (lambda _ - (substitute* "test-suite/standalone/test-out-of-memory" - (("!#") "!#\n\n(exit 77)\n")) - (delete-file "test-suite/tests/version.test") - #t)))))) + (delete-file "test-suite/tests/version.test"))))))) (native-inputs (modify-inputs (package-native-inputs guile-3.0) (prepend autoconf @@ -571,10 +565,6 @@ (define-public guile-for-guile-emacs (substitute* "test-suite/tests/version.test" (("\\(pass-if \"version reporting works\"" m) (string-append "#;" m))) - ;; Warning: Unwind-only `out-of-memory' exception; skipping pre-unwind handler. - ;; FAIL: test-out-of-memory - (substitute* "test-suite/standalone/Makefile.am" - (("(check_SCRIPTS|TESTS) \\+= test-out-of-memory") "")) (patch-shebang "build-aux/git-version-gen") (invoke "sh" "autogen.sh")