From: Andreas Enge <andreas@enge.fr>
To: 68714@debbugs.gnu.org
Cc: Andreas Enge <andreas@enge.fr>,
Guillaume Le Vaillant <glv@posteo.net>,
Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>,
Munyoki Kilyungi <me@bonfacemunyoki.com>,
Sharlatan Hellseher <sharlatanus@gmail.com>,
jgart <jgart@dismail.de>
Subject: [bug#68714] [PATCH 3/5] gnu: s7: Compile with flint@3.
Date: Thu, 25 Jan 2024 14:58:04 +0100 [thread overview]
Message-ID: <c0c523a4e17705c40a0ac6f84fb0ca42bd0b305c.1706190861.git.andreas@enge.fr> (raw)
In-Reply-To: <cover.1706190861.git.andreas@enge.fr>
* 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 <ludo@gnu.org>
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023 Andreas Enge <andreas@enge.fr>
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge <andreas@enge.fr>
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <mhw@netris.org>
# Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
@@ -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 ( <paren@disroot.org>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
-;;; Copyright © 2023 Andrew Kravchuk <awkravchuk@gmail.com.
+;;; Copyright © 2023 Andrew Kravchuk <awkravchuk@gmail.com>
+;;; Copyright © 2024 Andreas Enge <andreas@enge.fr>
;;;
;;; 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 <andreas@enge.fr>
+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 <mpfr.h>
+ #include <mpc.h>
+
+-#include <arb.h>
+-#include <acb.h>
+-#include <acb_hypgeom.h>
+-#include <acb_elliptic.h>
++#include <flint/arb.h>
++#include <flint/acb.h>
++#include <flint/acb_hypgeom.h>
++#include <flint/acb_elliptic.h>
+
+ #define WITH_GMP 1
+ #include "s7.h"
+--
+2.41.0
+
--
2.41.0
next prev parent reply other threads:[~2024-01-25 13:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-25 13:54 [bug#68714] [PATCH 0/5] Update flint to 3.0.1 Andreas Enge
2024-01-25 13:58 ` [bug#68714] [PATCH 1/5] gnu: flint: Update " Andreas Enge
2024-01-25 13:58 ` [bug#68714] [PATCH 2/5] gnu: pynac: Remove package Andreas Enge
2024-01-25 13:58 ` Andreas Enge [this message]
2024-01-25 13:58 ` [bug#68714] [PATCH 4/5] gnu: python-flint: Update to 0.5.0 and build with flint@3 Andreas Enge
2024-01-25 13:58 ` [bug#68714] [PATCH 5/5] gnu: arb: Deprecate package Andreas Enge
2024-01-25 22:27 ` [bug#68714] [PATCH 0/5] Update flint to 3.0.1 Sharlatan Hellseher
2024-01-26 5:21 ` Liliana Marie Prikler
2024-01-26 9:24 ` bug#68714: Done Andreas Enge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c0c523a4e17705c40a0ac6f84fb0ca42bd0b305c.1706190861.git.andreas@enge.fr \
--to=andreas@enge.fr \
--cc=68714@debbugs.gnu.org \
--cc=cox.katherine.e+guix@gmail.com \
--cc=glv@posteo.net \
--cc=jgart@dismail.de \
--cc=me@bonfacemunyoki.com \
--cc=sharlatanus@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).