From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id +AVVIEdpsmU1nAAAe85BDQ:P1 (envelope-from ) for ; Thu, 25 Jan 2024 14:59:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id +AVVIEdpsmU1nAAAe85BDQ (envelope-from ) for ; Thu, 25 Jan 2024 14:59:35 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1706191175; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Kb6/Uwh7+fZ4lcJZeI3KfQcQbXjLyL9MRkUI+JinP9A=; b=iBKT9ZAeGdnkY8Gbgsg5mfa3jmbQk4i7Tn6UU0lkd5pHb08YnnH7GKssnR6DJvIU2ux64I qV+Gqg5qykbP7Abd8/KbK9XEDTZyPPRAgsncTHQlSMiAAnIST/lyyBZD+0ctdp0DCyYzyX oRk5nfKcqXJLPgz2Wr2W/kvzLa4wriw4ujQXsv2DpfQJf6DUB5V9OooCj1xuv15/zn8WNy PjIoJtiqmPIZCEuS/aH2BnMUgqScuUL+UZGe5rQOqshC+WWxpZNMVKocMiQF2LkVg4NVAG Ul19CTQY2QDEzOx6H3iIWpPi2S2//gtT1PbO4uB1xXgvQvIktXQXvDIL7GHucg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1706191175; a=rsa-sha256; cv=none; b=RoB2DLhj4Bzq2Im/WoB0K0V6u0m+AfuxUImbnHBLh38HA4ly+FMrlVFGjPQnQL+rPkF74b 2wNIahMYg+3dwFPUL90hlne9OFkB0zJVqz6tIwpeutExHa7N0lXWLkTVtwwmPTKbt/l+UP mHjG2cnTmzUG7UFqdFWgwixuf47BTFwKayyzl7mygKhUUd0VgAgJ6bnWrPHUTisJJH1hsM hRxiQnKZcWKFqv1GRuBa2Yrs9ZE8gsCOMMM4Ogejd9VyFgVCt5q7HmTBB/CDLjpVahTQS4 8SxNEY595wM5ggVgEPdXd1uX0XRd8crQdNwtHclMqwA2fu7QccJTAotTO7QkLA== 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 556D55BE63 for ; Thu, 25 Jan 2024 14:59:35 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT0G1-00029P-St; Thu, 25 Jan 2024 08:59:05 -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 1rT0Fv-00027J-CX for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 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 1rT0Fu-0007RQ-Py for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT0Fz-0000la-NW; Thu, 25 Jan 2024 08:59:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68714] [PATCH 3/5] gnu: s7: Compile with flint@3. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: glv@posteo.net, cox.katherine.e+guix@gmail.com, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 13:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68714@debbugs.gnu.org Cc: Andreas Enge , Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 68714-submit@debbugs.gnu.org id=B68714.17061911232886 (code B ref 68714); Thu, 25 Jan 2024 13:59:03 +0000 Received: (at 68714) by debbugs.gnu.org; 25 Jan 2024 13:58:43 +0000 Received: from localhost ([127.0.0.1]:47642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0Fe-0000kQ-92 for submit@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:43 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:58880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0FY-0000jG-7J for 68714@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:38 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id CD20B115E; Thu, 25 Jan 2024 14:58:22 +0100 (CET) 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 ip4wZlkU0zqg; Thu, 25 Jan 2024 14:58:21 +0100 (CET) Received: from jurong.math.u-bordeaux1.fr (sauterelleold.math.u-bordeaux1.fr [147.210.16.130]) by hera.aquilenet.fr (Postfix) with ESMTPSA id BE4BA115A; Thu, 25 Jan 2024 14:58:21 +0100 (CET) From: Andreas Enge Date: Thu, 25 Jan 2024 14:58:04 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.16 X-Migadu-Queue-Id: 556D55BE63 X-Spam-Score: -4.16 X-Migadu-Scanner: mx11.migadu.com X-TUID: QqxmmXhpulcX * gnu/packages/patches/s7-flint-3.patch: New file. * gnu/local.mk (dist_patch_DATA): Register file. * gnu/packages/lisp.scm (s7-bootstrap)[source]: Add patch. [inputs]: Remove arb. Change-Id: I06bac9d850977b8ee769e629f1b64411a8dc3247 --- gnu/local.mk | 3 ++- gnu/packages/lisp.scm | 10 +++++---- gnu/packages/patches/s7-flint-3.patch | 31 +++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/s7-flint-3.patch diff --git a/gnu/local.mk b/gnu/local.mk index 43d02ee793..9eac0cae1a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012-2024 Ludovic Courtès -# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023 Andreas Enge +# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge # Copyright © 2016 Mathieu Lirzin # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver # Copyright © 2016 Chris Marusich @@ -2003,6 +2003,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch \ + %D%/packages/patches/s7-flint-3.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \ diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8e614b7d90..29d5ddebdc 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -25,7 +25,8 @@ ;;; Copyright © 2022 ( ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Yovan Naumovski -;;; Copyright © 2023 Andrew Kravchuk +;;; Copyright © 2024 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -1502,7 +1503,8 @@ (define-public s7-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0fiw8lb7rswglixvn271la2q2hgwszrf2ckykhr6jjxdvmb9a7d0")))) + "0fiw8lb7rswglixvn271la2q2hgwszrf2ckykhr6jjxdvmb9a7d0")) + (patches (search-patches "s7-flint-3.patch")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests in bootstrap @@ -1533,7 +1535,7 @@ (define-public s7-bootstrap (invoke #$(cc-for-target) "libarb_s7.c" "-I." "-O2" "-g" "-shared" "-o" "libarb_s7.so" - "-larb" "-lflint" "-lmpc" "-fPIC") + "-lflint" "-lmpc" "-fPIC") (display "[BUILD] libnotcurses_s7.so\n") (invoke #$(cc-for-target) "notcurses_s7.c" "-I." "-O2" "-g" @@ -1572,7 +1574,7 @@ (define-public s7-bootstrap (install-file "s7.c" share) (install-file "s7.h" inc) (install-file "s7.html" doc))))))) - (inputs (list arb flint mpc notcurses)) + (inputs (list flint mpc notcurses)) (home-page "https://ccrma.stanford.edu/software/snd/snd/s7.html") (synopsis "Scheme interpreter intended as an extension language") (description diff --git a/gnu/packages/patches/s7-flint-3.patch b/gnu/packages/patches/s7-flint-3.patch new file mode 100644 index 0000000000..49f47adda1 --- /dev/null +++ b/gnu/packages/patches/s7-flint-3.patch @@ -0,0 +1,31 @@ +From bd54bd42c5933e4c571dcfd6a8afac8e52cf7366 Mon Sep 17 00:00:00 2001 +From: Andreas Enge +Date: Thu, 25 Jan 2024 12:13:18 +0100 +Subject: [PATCH] Adapt libarb_s7.c to FLINT 3. + +--- + libarb_s7.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libarb_s7.c b/libarb_s7.c +index 7413ccc..d9e0084 100644 +--- a/libarb_s7.c ++++ b/libarb_s7.c +@@ -6,10 +6,10 @@ + #include + #include + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #define WITH_GMP 1 + #include "s7.h" +-- +2.41.0 + -- 2.41.0