From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SKIMDuMb3l5RfwAA0tVLHw (envelope-from ) for ; Mon, 08 Jun 2020 11:07:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id CBe5CeMb3l7rNQAAbx9fmQ (envelope-from ) for ; Mon, 08 Jun 2020 11:07:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E9E709408FC for ; Mon, 8 Jun 2020 11:07:14 +0000 (UTC) Received: from localhost ([::1]:56422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiFcX-0002Y8-VK for larch@yhetil.org; Mon, 08 Jun 2020 07:07:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiFcN-0002QP-Ay for guix-patches@gnu.org; Mon, 08 Jun 2020 07:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jiFcN-0006op-1d for guix-patches@gnu.org; Mon, 08 Jun 2020 07:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jiFcM-00051p-Se for guix-patches@gnu.org; Mon, 08 Jun 2020 07:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40283] [PATCH v2 3/3] gnu: arb: Build with flint 2.6. Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jun 2020 11:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40283 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40283@debbugs.gnu.org Cc: mbakke@fastmail.com Received: via spool by 40283-submit@debbugs.gnu.org id=B40283.159161436519242 (code B ref 40283); Mon, 08 Jun 2020 11:07:02 +0000 Received: (at 40283) by debbugs.gnu.org; 8 Jun 2020 11:06:05 +0000 Received: from localhost ([127.0.0.1]:55998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiFbQ-00050H-VH for submit@debbugs.gnu.org; Mon, 08 Jun 2020 07:06:05 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:38666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiFbI-0004zF-VB for 40283@debbugs.gnu.org; Mon, 08 Jun 2020 07:06:02 -0400 Received: (qmail 16066 invoked by uid 1009); 8 Jun 2020 13:05:55 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25836. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.014697 secs); 08 Jun 2020 11:05:55 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 8 Jun 2020 13:05:55 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Mon, 8 Jun 2020 13:05:50 +0200 Message-Id: <20200608110550.16488-3-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608110550.16488-1-kuba@kadziolka.net> References: <20200608110550.16488-1-kuba@kadziolka.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Qmailux-2.08st: added fake Content-Type header Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 2.49 X-TUID: Y5LfeghK8/Wj Backport an upstream patch to fix a compatibility issue with flint 2.6. * gnu/packages/algebra.scm (arb): Add patch. * gnu/packages/patches/arb-flint-2.6.patch: New file. * gnu/local.mk (dist_patch_DATA): Register new file. --- gnu/local.mk | 1 + gnu/packages/algebra.scm | 3 +- gnu/packages/patches/arb-flint-2.6.patch | 48 ++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/arb-flint-2.6.patch diff --git a/gnu/local.mk b/gnu/local.mk index 27e96ea77b..3ed0a98687 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -754,6 +754,7 @@ dist_patch_DATA = \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ + %D%/packages/patches/arb-flint-2.6.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 6b632d3e95..aceaee52f9 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -502,7 +502,8 @@ fast arithmetic.") (file-name (git-file-name name version)) (sha256 (base32 - "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1")))) + "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1")) + (patches (search-patches "arb-flint-2.6.patch")))) (build-system gnu-build-system) (propagated-inputs `(("flint" ,flint))) ; flint.h is included by arf.h diff --git a/gnu/packages/patches/arb-flint-2.6.patch b/gnu/packages/patches/arb-flint-2.6.patch new file mode 100644 index 0000000000..98ff5e95b4 --- /dev/null +++ b/gnu/packages/patches/arb-flint-2.6.patch @@ -0,0 +1,48 @@ +From d3d9983231e0f034e86a1e75761627eb8213b704 Mon Sep 17 00:00:00 2001 +From: fredrik +Date: Wed, 29 Apr 2020 13:41:36 +0200 +Subject: [PATCH] handle flint incompatibilities + +--- + fmpr.h | 4 ++++ + fmpz_extras.h | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/fmpr.h b/fmpr.h +index 2204d72e..c6a8c342 100644 +--- a/fmpr.h ++++ b/fmpr.h +@@ -22,7 +22,11 @@ + #include "flint/flint.h" + #include "flint/fmpz.h" + #include "flint/fmpq.h" ++#if __FLINT_RELEASE < 20600 + #include "flint/config.h" ++#else ++#include "flint/flint-config.h" ++#endif + #include "fmpz_extras.h" + + #ifndef flint_abort +diff --git a/fmpz_extras.h b/fmpz_extras.h +index 4fd0538f..486e28c8 100644 +--- a/fmpz_extras.h ++++ b/fmpz_extras.h +@@ -43,6 +43,8 @@ fmpz_add_inline(fmpz_t z, const fmpz_t x, const fmpz_t y) + fmpz_add(z, x, y); + } + ++#if __FLINT_RELEASE < 20600 ++ + static __inline__ void + fmpz_add_si(fmpz_t z, const fmpz_t x, slong y) + { +@@ -61,6 +63,8 @@ fmpz_sub_si(fmpz_t z, const fmpz_t x, slong y) + fmpz_add_ui(z, x, -y); + } + ++#endif ++ + static __inline__ void + fmpz_add_si_inline(fmpz_t z, const fmpz_t x, slong y) + { -- 2.26.2