From patchwork Thu Aug 10 10:22:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 52710 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 03F6F27BBEA; Thu, 10 Aug 2023 11:24: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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 9FB7827BBE2 for ; Thu, 10 Aug 2023 11:24:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qU2po-0004mt-Ad; Thu, 10 Aug 2023 06:24: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 1qU2pn-0004mc-7q for guix-patches@gnu.org; Thu, 10 Aug 2023 06:24: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 1qU2pm-0004UP-Vn for guix-patches@gnu.org; Thu, 10 Aug 2023 06:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qU2pm-0002Df-Ee for guix-patches@gnu.org; Thu, 10 Aug 2023 06:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65200] Update gmp to 6.3.0 Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Aug 2023 10:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65200 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65200@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16916629838446 (code B ref -1); Thu, 10 Aug 2023 10:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Aug 2023 10:23:03 +0000 Received: from localhost ([127.0.0.1]:41477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qU2op-0002CA-45 for submit@debbugs.gnu.org; Thu, 10 Aug 2023 06:23:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qU2ol-0002BO-Ux for submit@debbugs.gnu.org; Thu, 10 Aug 2023 06:23: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 1qU2og-0004hN-GZ for guix-patches@gnu.org; Thu, 10 Aug 2023 06:22:54 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qU2oe-0004Or-Lx for guix-patches@gnu.org; Thu, 10 Aug 2023 06:22:54 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id DFAFBA13; Thu, 10 Aug 2023 12:22:46 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jHSTUv7cyTJy; Thu, 10 Aug 2023 12:22:45 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D0F5732C; Thu, 10 Aug 2023 12:22:45 +0200 (CEST) Date: Thu, 10 Aug 2023 12:22:44 +0200 From: Andreas Enge Message-ID: MIME-Version: 1.0 Content-Disposition: inline Received-SPF: pass client-ip=2a0c:e300::1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 The attached patch updates gmp to the latest release 6.3.0. I have tested it on x86_64 and the x86_64-w64-mingw32 cross-compilation target, since I have taken out a work-around for this target. There are close to 20000 dependent packages, but as far as I can see bootstrapping is not concerned, which starts from gmp-6.0. It would be interesting to try whether we can bootstrap directly from 6.3.0 now, that is, whether the comment ;; We keep this one around to bootstrap GCC, to work around a compilation ;; issue on ARM. See ;; . is still valid; it might let us drop the two gmp patches altogether. Andreas From 2955ea78db15dee770a70fac51ea40016b13b4ef Mon Sep 17 00:00:00 2001 Message-ID: <2955ea78db15dee770a70fac51ea40016b13b4ef.1691662380.git.andreas@enge.fr> From: Andreas Enge Date: Thu, 10 Aug 2023 12:12:48 +0200 Subject: [PATCH] gnu: gmp: Update to 6.3.0. * gnu/packages/multiprecision.scm (gmp)[source]: Update to 6.3.0. Disable patch. [arguments]: Remove 'setenv phase. --- gnu/packages/multiprecision.scm | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) base-commit: 90e34d25d5e7c14b7f3293a78f3cdad676c0d035 diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 3aa5dccfab..cf11c81635 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver -;;; Copyright © 2015, 2018 Andreas Enge +;;; Copyright © 2015, 2018, 2023 Andreas Enge ;;; Copyright © 2016, 2020 Nicolas Goaziou ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice @@ -45,7 +45,7 @@ (define-module (gnu packages multiprecision) (define-public gmp (package (name "gmp") - (version "6.2.1") + (version "6.3.0") (source (origin (method url-fetch) (uri @@ -53,8 +53,7 @@ (define-public gmp version ".tar.xz")) (sha256 (base32 - "1wml97fdmpcynsbw9yl77rj29qibfp652d0w3222zlfx5j8jjj7x")) - (patches (search-patches "gmp-faulty-test.patch")))) + "1648ad1mr7c1r8lkkqshrv1jfjgfdb30plsadxhni7mq041bihm3")))) (build-system gnu-build-system) (native-inputs (list m4)) (outputs '("out" "debug")) @@ -70,26 +69,7 @@ (define-public gmp ;; they produce different headers. We need shared. `("--disable-static" "--enable-shared")) - (else '()))) - ;; Remove after core-updates merge. - ;; Workaround for gcc-7 transition breakage, -system and cross-build, - ;; Note: See for why not 'CPATH'. - ;; Note: See for why not 'C_INCLUDE_PATH' & co. - ,@(if (target-mingw?) - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda _ - (let ((gcc (assoc-ref %build-inputs "cross-gcc")) - (libc (assoc-ref %build-inputs "cross-libc"))) - (setenv "CROSS_CPLUS_INCLUDE_PATH" - (string-append gcc "/include/c++" - ":" gcc "/include" - ":" libc "/include")) - (format #t "environment variable `CROSS_CPLUS_INCLUDE_PATH' set to `~a'\n" - (getenv "CROSS_CPLUS_INCLUDE_PATH")) - #t))))) - '()))) + (else '()))))) (synopsis "Multiple-precision arithmetic library") (description "The @acronym{GMP, the GNU Multiple Precision Arithmetic} library performs