Received: (at 75274) by debbugs.gnu.org; 6 Jan 2025 04:44:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 05 23:44:28 2025
Received: from localhost ([127.0.0.1]:36355 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tUeyZ-0003O1-3F
for submit <at> debbugs.gnu.org; Sun, 05 Jan 2025 23:44:27 -0500
Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:43342)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <lichengtai@HIDDEN>)
id 1tUeyU-0003Ni-7w
for 75274 <at> debbugs.gnu.org; Sun, 05 Jan 2025 23:44:25 -0500
Received: by mail-pl1-x633.google.com with SMTP id
d9443c01a7336-21631789fcdso146375715ad.1
for <75274 <at> debbugs.gnu.org>; Sun, 05 Jan 2025 20:44:22 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1736138656; x=1736743456; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=uVRmtm+m8IlhS6f2UWQrIpKtDAniUIUXOziqj2hw5G8=;
b=cwNGH6LAppZy6vgUiq4n+4Sw+SU8F1IdTDQK1hDjDA/bEHJ49ZV5qLgZzh8zgw5rtX
CJeeI5xpEGbHoqMIc/gLlR2/xHaLqxrzdB1Xmvo/8//UhO8mdHQ+bBP7XhuY5kZc2ACL
Q+o6K1ebYunCgzJDnOkc0pGDfR/9RsDFbJpgZhVUVWulFFakR+vEmAlzW6uNKbAZhcXI
9W3qDvXyL6G1ujEFbzwszGdBlaLH8UMHsd8UXCaqe7P1cbq8GBPqCfbMiDsJFPw+pFYU
Qj+G8OGN8xVC3dNFTcAL2vv6iyMyq+uGN5kHzV43SnrziRS7vacjzlpzQ7FWZ+Qlrrtu
Sx+A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736138656; x=1736743456;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=uVRmtm+m8IlhS6f2UWQrIpKtDAniUIUXOziqj2hw5G8=;
b=fm7SRc8IheX9eOSzSCQst08V94HOWSkjY2GKvYw881IK+2GZkgjuVxihryRoBi0c/G
p5HTo+/apkJqR70XoVmhXS5HKxdeXrcnjfveRR0zYiarToLcwRKEKjTJlCyvUi4z+Grg
S0n6z/M/vtRcPuHN+wq4OWpzDwyNqT7cUe2I07A3JKekuIft7/L636gU4eYvpnHCfa1n
Mfkj9rfTJyJQ+g0sqyL2Wa/ZPgkhaecqs8v96Henm6AsU6vYlG1jucNO1iRW16BrK14r
NQ6uFnL/EMZFpp8SXLCmZn5PP1duqVdoUhIyk0wnfCYyQL9+P2tBpyQ6DqesBSxvP7UU
cD5g==
X-Gm-Message-State: AOJu0Yy2KpwFtfIXlyosMlVPEOjYQrLG42ZWp5sDz9lvDz5YthBZf7dx
gR7oVvZFwbpnhGZQcrVcPOJKSfGTElUh3eIdMIdCVg5RZStuftGrZFa4IGfV
X-Gm-Gg: ASbGncso1xoQM9WlvernQnQx0Ja5jXol1JGuOPw1KwOM5cUdIyxWhKy0LNGru8GNc/A
hS+SAR3BRZ+iRO+5IC7LOYHu7qc3c46Ao5YCE3mru7z24CkCST28ujYBZGqZKlFeFJfTmECJGL6
BsptwTF2O0yQ0Sxv+nBIeBPDiM+VpM0zL9CmRTQWOSvOpp20/0rFCU4uIeamrWKTd/liHxPeTiU
xpiCNOUUo/ZJ16jgVuuOcc8I0CTJf0ljDwe53wDJGGng0MhcQ==
X-Google-Smtp-Source: AGHT+IF1CG8iaPI9i6orFXYVxO9XTKceRDTlI4mnYPDeYF3mtfVMfRnh6/YsuXhRU2CQZnAQl+YrvA==
X-Received: by 2002:a05:6a20:7345:b0:1e1:adb8:c011 with SMTP id
adf61e73a8af0-1e5e1f57c8cmr85722666637.18.1736138655592;
Sun, 05 Jan 2025 20:44:15 -0800 (PST)
Received: from DEskMiniX300.. ([38.84.157.61])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-72aad83033esm30419716b3a.48.2025.01.05.20.44.14
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 05 Jan 2025 20:44:15 -0800 (PST)
From: Andy Tai <atai@HIDDEN>
To: 75274 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: bc: Update to 1.08.1.
Date: Sun, 5 Jan 2025 20:44:10 -0800
Message-Id: <97fc9994b482ef6c56725f84d61d8753c3336188.1736138578.git.atai@HIDDEN>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 75274
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)
* gnu/packages/algebra.scm (bc): Update to 1.08.1.
[source](origin): Remove patch.
* gnu/packages/patches/bc-fix-cross-compilation.patch: Delete.
* gnu/local.mk: Unregister deleted file.
Change-Id: Iada592d2deeeec91f875306a0fb6f8c4056ccfad
---
gnu/local.mk | 1 -
gnu/packages/algebra.scm | 12 +-
.../patches/bc-fix-cross-compilation.patch | 189 ------------------
3 files changed, 6 insertions(+), 196 deletions(-)
delete mode 100644 gnu/packages/patches/bc-fix-cross-compilation.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index f118fe4442..2eb92b3059 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1016,7 +1016,6 @@ dist_patch_DATA = \
%D%/packages/patches/bash-linux-pgrp-pipe.patch \
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
- %D%/packages/patches/bc-fix-cross-compilation.patch \
%D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
%D%/packages/patches/biboumi-cmake-ignore-git.patch \
%D%/packages/patches/brightnessctl-elogind-support.patch \
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 5da77b6318..e8a132fe67 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -53,6 +53,7 @@ (define-module (gnu packages algebra)
#:use-module (gnu packages maths)
#:use-module (gnu packages mpi)
#:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages perl)
@@ -667,19 +668,18 @@ (define-public gmp-ecm
(define-public bc
(package
(name "bc")
- (version "1.07.1")
+ (version "1.08.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz"))
+ (uri (string-append "mirror://gnu/bc/bc-" version ".tar.xz"))
(sha256
(base32
- "0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2"))
- (patches (search-patches "bc-fix-cross-compilation.patch"))))
+ "08yhh4l7r9hs5k75jcma82czgpsh1454c0vm64vccd1kbc8k0m2i"))))
(build-system gnu-build-system)
(native-inputs
(list automake autoconf ed flex readline texinfo))
(inputs
- (list readline))
+ (list readline ncurses))
(arguments
'(#:configure-flags
(list "--with-readline")
@@ -695,7 +695,7 @@ (define-public bc
an interactive environment for evaluating mathematical statements. Its
syntax is similar to that of C, so basic usage is familiar. It also includes
\"dc\", a reverse-polish calculator.")
- (license license:gpl2+)))
+ (license license:gpl3+)))
;; The original kiss-fft does not have a complete build system and does not
;; build any shared libraries. This is a fork used by Extempore.
diff --git a/gnu/packages/patches/bc-fix-cross-compilation.patch b/gnu/packages/patches/bc-fix-cross-compilation.patch
deleted file mode 100644
index 04f2c92abf..0000000000
--- a/gnu/packages/patches/bc-fix-cross-compilation.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-Patch adapted from Nix.
-Upstream-status: Submitted to bug-bc@HIDDEN
-
-diff --git a/bc/Makefile.am b/bc/Makefile.am
-index d9d412e..13f2b1e 100644
---- a/bc/Makefile.am
-+++ b/bc/Makefile.am
-@@ -8,7 +8,7 @@ EXTRA_DIST = bc.h bcdefs.h const.h fix-libmath_h global.h libmath.b proto.h \
- sbc.y
- noinst_HEADERS = libmath.h
-
--DISTCLEANFILES = sbc sbc.c sbc.h libmath.h
-+DISTCLEANFILES = fbc sbc sbc.c sbc.h libmath.h
-
- MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \
- bc.y bcdefs.h const.h execute.c fix-libmath_h \
-@@ -17,6 +17,7 @@ MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \
-
- AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../h
- LIBBC = ../lib/libbc.a
-+LIBBC_HOST = ../lib/libbc_host.a
- LIBL = @LEXLIB@
- LDADD = $(LIBBC) $(LIBL) @READLINELIB@
-
-@@ -29,15 +30,22 @@ $(PROGRAMS): libmath.h $(LIBBC)
- scan.o: bc.h
- global.o: libmath.h
-
--fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o
-+%.o_host: CC := $(CC_FOR_BUILD)
-+%.o_host: %.c
-+ $(COMPILE) -c -o $@ $<
-
--libmath.h: libmath.b $(fbcOBJ) $(LIBBC)
-- echo '{0}' > libmath.h
-- $(MAKE) global.o
-- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS)
-- ./fbc -c $(srcdir)/libmath.b </dev/null >libmath.h
-+fbcOBJ = $(addsuffix _host,\
-+ main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o)
-+
-+global_host.c: global.c
-+ sed 's/#include "libmath.h"/{0}/' $< > $@
-+
-+fbc: $(fbcOBJ) global_host.o_host $(LIBBC_HOST) $(LIBS)
-+ $(CC_FOR_BUILD) $(LIBL) $(READLINELIB) -o $@ $^
-+
-+libmath.h: libmath.b fbc $(LIBBC_HOST)
-+ ./fbc -c $(srcdir)/libmath.b < /dev/null > libmath.h
- $(srcdir)/fix-libmath_h
-- rm -f ./fbc ./global.o
-
- sbcOBJ = main.o sbc.o scan.o execute.o global.o load.o storage.o util.o \
- warranty.o
-diff --git a/configure.ac b/configure.ac
-index fc74573..5cabb73 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,6 +20,7 @@ m4_define([dc_version], 1.4.1)
-
- AC_INIT([bc],[bc_version])
- AC_CONFIG_SRCDIR(doc/bc.1)
-+AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([dist-bzip2])
- AC_CONFIG_HEADERS(config.h)
-
-@@ -35,6 +36,7 @@ AC_DEFINE([DC_COPYRIGHT],
- [Define the dc copyright line.])
-
- AC_PROG_CC
-+AX_CC_FOR_BUILD
- AC_USE_SYSTEM_EXTENSIONS
-
- AM_PROG_LEX
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index ec4bf59..24c9f42 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in
--noinst_LIBRARIES = libbc.a
-+noinst_LIBRARIES = libbc.a libbc_host.a
-
- AM_CPPFLAGS = -I. -I.. -I$(srcdir)/../h
-
-@@ -7,8 +7,6 @@ libbc_a_SOURCES = getopt.c getopt1.c vfprintf.c number.c
-
- DEFS = @DEFS@ $(DEFSADD)
-
--AM_CFLAGS = @CFLAGS@
--
- MAINTAINERCLEANFILES = Makefile.in number.c
- CLEANFILES = testmul specialnumber muldigits.h
-
-@@ -24,3 +22,11 @@ testmul: testmul.o number.o
-
- specialnumber: newnumber.o
- cp newnumber.o number.o
-+
-+%.o_host: CC := $(CC_FOR_BUILD)
-+%.o_host : %.c
-+ $(COMPILE) -c -o $@ $<
-+
-+libbc_host.a : $(addsuffix _host,$(libbc_a_OBJECTS))
-+ ar cru $@ $+
-+ ranlib $@
-diff --git a/m4/cc_for_build.m4 b/m4/cc_for_build.m4
-new file mode 100644
-index 0000000..c62ffad
---- /dev/null
-+++ b/m4/cc_for_build.m4
-@@ -0,0 +1,77 @@
-+# ===========================================================================
-+# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+# AX_CC_FOR_BUILD
-+#
-+# DESCRIPTION
-+#
-+# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD.
-+#
-+# LICENSE
-+#
-+# Copyright (c) 2010 Reuben Thomas <rrt@HIDDEN>
-+# Copyright (c) 1999 Richard Henderson <rth@HIDDEN>
-+#
-+# This program is free software: you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by the
-+# Free Software Foundation, either version 3 of the License, or (at your
-+# option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+# Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License along
-+# with this program. If not, see <https://www.gnu.org/licenses/>.
-+#
-+# As a special exception, the respective Autoconf Macro's copyright owner
-+# gives unlimited permission to copy, distribute and modify the configure
-+# scripts that are the output of Autoconf when processing the Macro. You
-+# need not follow the terms of the GNU General Public License when using
-+# or distributing such scripts, even though portions of the text of the
-+# Macro appear in them. The GNU General Public License (GPL) does govern
-+# all other use of the material that constitutes the Autoconf Macro.
-+#
-+# This special exception to the GPL applies to versions of the Autoconf
-+# Macro released by the Autoconf Archive. When you make and distribute a
-+# modified version of the Autoconf Macro, you may extend this special
-+# exception to the GPL to apply to your modified version as well.
-+
-+#serial 3
-+
-+dnl Get a default for CC_FOR_BUILD to put into Makefile.
-+AC_DEFUN([AX_CC_FOR_BUILD],
-+[# Put a plausible default for CC_FOR_BUILD in Makefile.
-+if test -z "$CC_FOR_BUILD"; then
-+ if test "x$cross_compiling" = "xno"; then
-+ CC_FOR_BUILD='$(CC)'
-+ else
-+ CC_FOR_BUILD=gcc
-+ fi
-+fi
-+AC_SUBST(CC_FOR_BUILD)
-+# Also set EXEEXT_FOR_BUILD.
-+if test "x$cross_compiling" = "xno"; then
-+ EXEEXT_FOR_BUILD='$(EXEEXT)'
-+else
-+ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
-+ [rm -f conftest*
-+ echo 'int main () { return 0; }' > conftest.c
-+ bfd_cv_build_exeext=
-+ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
-+ for file in conftest.*; do
-+ case $file in
-+ *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-+ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
-+ esac
-+ done
-+ rm -f conftest*
-+ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
-+ EXEEXT_FOR_BUILD=""
-+ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
-+fi
-+AC_SUBST(EXEEXT_FOR_BUILD)])dnl
base-commit: 7a7c01b393ecb20dff142b9ea9bf8317e994bef2
--
2.34.1
guix-patches@HIDDEN:bug#75274; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 2 Jan 2025 03:30:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jan 01 22:30:52 2025
Received: from localhost ([127.0.0.1]:41695 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tTBv9-0006kD-Ey
for submit <at> debbugs.gnu.org; Wed, 01 Jan 2025 22:30:52 -0500
Received: from lists.gnu.org ([2001:470:142::17]:59158)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <lichengtai@HIDDEN>)
id 1tTBv0-0006jp-Uz
for submit <at> debbugs.gnu.org; Wed, 01 Jan 2025 22:30:47 -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 <lichengtai@HIDDEN>)
id 1tTBuu-0005mv-6A
for guix-patches@HIDDEN; Wed, 01 Jan 2025 22:30:36 -0500
Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <lichengtai@HIDDEN>)
id 1tTBuk-0002Py-FE
for guix-patches@HIDDEN; Wed, 01 Jan 2025 22:30:29 -0500
Received: by mail-pl1-x629.google.com with SMTP id
d9443c01a7336-218c8aca5f1so185501695ad.0
for <guix-patches@HIDDEN>; Wed, 01 Jan 2025 19:30:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1735788624; x=1736393424; darn=gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=H1utBEyyRiQ1oLGWhUPIn6WHfaUBPr8L0ej0YlNgHeY=;
b=QEZb4jT2eRc0wQHYvnh2rJqlJkw+pCKkIGplfo1krm3cmK8GWwbrbimX3LDeBLA9+U
sn3CstaFZ8CeQ4UwAx1/PWKiCZzkqMim56h8wg48w+Cccsk6A1HRnVuCSA9XSWSfdWGN
frzWOn1swkDxQXQH7IrqlNx5yKOPloTm5FIC7DzF3ZYClVlSHB4zvdisSb3o1rDbkxtO
wBb0nM1ms9NWDK1niRaLZwZ0ZulSJh+185PFVFTem6BXf6IicLi/KTgKS07emKkWXg7Q
vEpFWPf8MGykVsgCG3j7PAnAWFfXdm2YzCdwz+0c8+16kGk9f/kpbuJZrcQxvwOVf78H
jovA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1735788624; x=1736393424;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=H1utBEyyRiQ1oLGWhUPIn6WHfaUBPr8L0ej0YlNgHeY=;
b=WKBcpRbeKFTDPQ4g3PtQ5O4hQXKSdDpz8Fz1tHVVpWJlpN2ANuwKZqCasvr4rVf7hz
FMZtp6wDzj46YRJL+Tnh6sTOji2ToxHEZgiuHYZQ+J9A6iRZocei8drxSFYIl4+mmvI7
GH7+yGzgBk0wWXjC4NnZN7JAhjCNbae39wY4zWfpRqPT6qeMHcPPRsnioRmFOCVFMF0C
f9Z3UhWJSFI/2KouCCCKRa+vVO/rx1mDl9SMV2uoZGMVnY6mRetQbqJyP+hV8e281mgX
3CEn4HVDtzEfc2gnPV2b2/caHgZR1Tlql+x8cUN+s9mQClIRmljlkhNMf4sH5VpZEY2U
votQ==
X-Gm-Message-State: AOJu0Ywxzws1bKV1xvsehFRNO2vXDqQ1yF3pKjqv3ZvVpdDi10hn0Svb
hecig3oO4LBWhHTPN/lhiP57IiypNytwMhujUqEepOcifIhvZvj0069fwmDf
X-Gm-Gg: ASbGncuIovRa/M9rBTmnNlyomYtfs4yvmUypfP64O+QtyxD2p3JBNNNRoD/FqpYooyy
7TJ0X/ED8b4F4+Sjl6GBC48/1UfhQR1i35rAem1R4Sa8BhfP1x+ULGNqIqMBfceSw9/tV6kvYB7
v2c5FslYzEhpxgBeWia7o54tKWaiZDwcU5cAzY47maozdzC43REHNnN39Thy8dg5HBbaia6SzWq
2Oc0/TZVY+iz10mb2KQ9GVW9k6ZI6IJ8+ixLWTP7VSNwU2a3A==
X-Google-Smtp-Source: AGHT+IEgZeNyuc8eIPgJTC5OTPz2SwwF+q+sNYtdo6BZjANClReQnRI4PNCUI/YZHc6PhebcFTQ9cw==
X-Received: by 2002:a05:6a00:39a3:b0:729:1c0f:b94a with SMTP id
d2e1a72fcca58-72abdeb9c0dmr64525096b3a.23.1735788624250;
Wed, 01 Jan 2025 19:30:24 -0800 (PST)
Received: from DEskMiniX300.. ([38.84.157.61])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-72aad831148sm23207966b3a.53.2025.01.01.19.30.23
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 01 Jan 2025 19:30:23 -0800 (PST)
From: Andy Tai <atai@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: bc: Update to 1.08.0
Date: Wed, 1 Jan 2025 19:30:18 -0800
Message-Id: <ffa7479b5e9baf596c08a0f4b31847a2669d7f2e.1735788553.git.atai@HIDDEN>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::629;
envelope-from=lichengtai@HIDDEN; helo=mail-pl1-x629.google.com
X-Spam_score_int: -17
X-Spam_score: -1.8
X-Spam_bar: -
X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001,
FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.222,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.2 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/algebra.scm (bc): Update to 1.08.0.
[source](origin):
Update patch file name. * gnu/packages/patches/bc-fix-cross-compilation.patch:
Delete. * gnu/packages/patches/bc-dc-build.patch: Ne [...]
Content analysis details: (1.2 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (lichengtai[at]gmail.com)
1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level
mail domains are different
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org]
0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and
EnvelopeFrom freemail headers are different
X-Debbugs-Envelope-To: submit
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.2 (/)
* gnu/packages/algebra.scm (bc): Update to 1.08.0.
[source](origin): Update patch file name.
* gnu/packages/patches/bc-fix-cross-compilation.patch: Delete.
* gnu/packages/patches/bc-dc-build.patch: New file.
* gnu/local.mk: Unregister deleted file and register new file.
Change-Id: Iada592d2deeeec91f875306a0fb6f8c4056ccfad
---
gnu/local.mk | 2 +-
gnu/packages/algebra.scm | 13 +-
gnu/packages/patches/bc-dc-build.patch | 8 +
.../patches/bc-fix-cross-compilation.patch | 189 ------------------
4 files changed, 16 insertions(+), 196 deletions(-)
create mode 100644 gnu/packages/patches/bc-dc-build.patch
delete mode 100644 gnu/packages/patches/bc-fix-cross-compilation.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 02a6fa616e..1e97389bc8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1016,7 +1016,7 @@ dist_patch_DATA = \
%D%/packages/patches/bash-linux-pgrp-pipe.patch \
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
- %D%/packages/patches/bc-fix-cross-compilation.patch \
+ %D%/packages/patches/bc-dc-build.patch \
%D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
%D%/packages/patches/biboumi-cmake-ignore-git.patch \
%D%/packages/patches/brightnessctl-elogind-support.patch \
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 3f73d9295d..24bd594b36 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -53,6 +53,7 @@ (define-module (gnu packages algebra)
#:use-module (gnu packages maths)
#:use-module (gnu packages mpi)
#:use-module (gnu packages multiprecision)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages perl)
@@ -650,19 +651,19 @@ (define-public gmp-ecm
(define-public bc
(package
(name "bc")
- (version "1.07.1")
+ (version "1.08.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz"))
+ (uri (string-append "mirror://gnu/bc/bc-" version ".tar.xz"))
(sha256
(base32
- "0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2"))
- (patches (search-patches "bc-fix-cross-compilation.patch"))))
+ "1kvd4hpq0fmb9bali9x21zwb1g0msvsj1jahanz96x13w06v9i3v"))
+ (patches (search-patches "bc-dc-build.patch"))))
(build-system gnu-build-system)
(native-inputs
(list automake autoconf ed flex readline texinfo))
(inputs
- (list readline))
+ (list readline ncurses))
(arguments
'(#:configure-flags
(list "--with-readline")
@@ -678,7 +679,7 @@ (define-public bc
an interactive environment for evaluating mathematical statements. Its
syntax is similar to that of C, so basic usage is familiar. It also includes
\"dc\", a reverse-polish calculator.")
- (license license:gpl2+)))
+ (license license:gpl3+)))
;; The original kiss-fft does not have a complete build system and does not
;; build any shared libraries. This is a fork used by Extempore.
diff --git a/gnu/packages/patches/bc-dc-build.patch b/gnu/packages/patches/bc-dc-build.patch
new file mode 100644
index 0000000000..6e672e187c
--- /dev/null
+++ b/gnu/packages/patches/bc-dc-build.patch
@@ -0,0 +1,8 @@
+--- a/dc/Makefile.am 2024-10-07 23:11:13.000000000 -0700
++++ b/dc/Makefile.am 2025-01-01 18:37:27.786207409 -0800
+@@ -11,4 +11,4 @@
+
+ AM_CFLAGS = @CFLAGS@
+
+-$(PROGRAMS): $(LDADD)
++$(PROGRAMS): $(LIBBC)
diff --git a/gnu/packages/patches/bc-fix-cross-compilation.patch b/gnu/packages/patches/bc-fix-cross-compilation.patch
deleted file mode 100644
index 04f2c92abf..0000000000
--- a/gnu/packages/patches/bc-fix-cross-compilation.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-Patch adapted from Nix.
-Upstream-status: Submitted to bug-bc@HIDDEN
-
-diff --git a/bc/Makefile.am b/bc/Makefile.am
-index d9d412e..13f2b1e 100644
---- a/bc/Makefile.am
-+++ b/bc/Makefile.am
-@@ -8,7 +8,7 @@ EXTRA_DIST = bc.h bcdefs.h const.h fix-libmath_h global.h libmath.b proto.h \
- sbc.y
- noinst_HEADERS = libmath.h
-
--DISTCLEANFILES = sbc sbc.c sbc.h libmath.h
-+DISTCLEANFILES = fbc sbc sbc.c sbc.h libmath.h
-
- MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \
- bc.y bcdefs.h const.h execute.c fix-libmath_h \
-@@ -17,6 +17,7 @@ MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \
-
- AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../h
- LIBBC = ../lib/libbc.a
-+LIBBC_HOST = ../lib/libbc_host.a
- LIBL = @LEXLIB@
- LDADD = $(LIBBC) $(LIBL) @READLINELIB@
-
-@@ -29,15 +30,22 @@ $(PROGRAMS): libmath.h $(LIBBC)
- scan.o: bc.h
- global.o: libmath.h
-
--fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o
-+%.o_host: CC := $(CC_FOR_BUILD)
-+%.o_host: %.c
-+ $(COMPILE) -c -o $@ $<
-
--libmath.h: libmath.b $(fbcOBJ) $(LIBBC)
-- echo '{0}' > libmath.h
-- $(MAKE) global.o
-- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS)
-- ./fbc -c $(srcdir)/libmath.b </dev/null >libmath.h
-+fbcOBJ = $(addsuffix _host,\
-+ main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o)
-+
-+global_host.c: global.c
-+ sed 's/#include "libmath.h"/{0}/' $< > $@
-+
-+fbc: $(fbcOBJ) global_host.o_host $(LIBBC_HOST) $(LIBS)
-+ $(CC_FOR_BUILD) $(LIBL) $(READLINELIB) -o $@ $^
-+
-+libmath.h: libmath.b fbc $(LIBBC_HOST)
-+ ./fbc -c $(srcdir)/libmath.b < /dev/null > libmath.h
- $(srcdir)/fix-libmath_h
-- rm -f ./fbc ./global.o
-
- sbcOBJ = main.o sbc.o scan.o execute.o global.o load.o storage.o util.o \
- warranty.o
-diff --git a/configure.ac b/configure.ac
-index fc74573..5cabb73 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,6 +20,7 @@ m4_define([dc_version], 1.4.1)
-
- AC_INIT([bc],[bc_version])
- AC_CONFIG_SRCDIR(doc/bc.1)
-+AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([dist-bzip2])
- AC_CONFIG_HEADERS(config.h)
-
-@@ -35,6 +36,7 @@ AC_DEFINE([DC_COPYRIGHT],
- [Define the dc copyright line.])
-
- AC_PROG_CC
-+AX_CC_FOR_BUILD
- AC_USE_SYSTEM_EXTENSIONS
-
- AM_PROG_LEX
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index ec4bf59..24c9f42 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in
--noinst_LIBRARIES = libbc.a
-+noinst_LIBRARIES = libbc.a libbc_host.a
-
- AM_CPPFLAGS = -I. -I.. -I$(srcdir)/../h
-
-@@ -7,8 +7,6 @@ libbc_a_SOURCES = getopt.c getopt1.c vfprintf.c number.c
-
- DEFS = @DEFS@ $(DEFSADD)
-
--AM_CFLAGS = @CFLAGS@
--
- MAINTAINERCLEANFILES = Makefile.in number.c
- CLEANFILES = testmul specialnumber muldigits.h
-
-@@ -24,3 +22,11 @@ testmul: testmul.o number.o
-
- specialnumber: newnumber.o
- cp newnumber.o number.o
-+
-+%.o_host: CC := $(CC_FOR_BUILD)
-+%.o_host : %.c
-+ $(COMPILE) -c -o $@ $<
-+
-+libbc_host.a : $(addsuffix _host,$(libbc_a_OBJECTS))
-+ ar cru $@ $+
-+ ranlib $@
-diff --git a/m4/cc_for_build.m4 b/m4/cc_for_build.m4
-new file mode 100644
-index 0000000..c62ffad
---- /dev/null
-+++ b/m4/cc_for_build.m4
-@@ -0,0 +1,77 @@
-+# ===========================================================================
-+# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+# AX_CC_FOR_BUILD
-+#
-+# DESCRIPTION
-+#
-+# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD.
-+#
-+# LICENSE
-+#
-+# Copyright (c) 2010 Reuben Thomas <rrt@HIDDEN>
-+# Copyright (c) 1999 Richard Henderson <rth@HIDDEN>
-+#
-+# This program is free software: you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by the
-+# Free Software Foundation, either version 3 of the License, or (at your
-+# option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+# Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License along
-+# with this program. If not, see <https://www.gnu.org/licenses/>.
-+#
-+# As a special exception, the respective Autoconf Macro's copyright owner
-+# gives unlimited permission to copy, distribute and modify the configure
-+# scripts that are the output of Autoconf when processing the Macro. You
-+# need not follow the terms of the GNU General Public License when using
-+# or distributing such scripts, even though portions of the text of the
-+# Macro appear in them. The GNU General Public License (GPL) does govern
-+# all other use of the material that constitutes the Autoconf Macro.
-+#
-+# This special exception to the GPL applies to versions of the Autoconf
-+# Macro released by the Autoconf Archive. When you make and distribute a
-+# modified version of the Autoconf Macro, you may extend this special
-+# exception to the GPL to apply to your modified version as well.
-+
-+#serial 3
-+
-+dnl Get a default for CC_FOR_BUILD to put into Makefile.
-+AC_DEFUN([AX_CC_FOR_BUILD],
-+[# Put a plausible default for CC_FOR_BUILD in Makefile.
-+if test -z "$CC_FOR_BUILD"; then
-+ if test "x$cross_compiling" = "xno"; then
-+ CC_FOR_BUILD='$(CC)'
-+ else
-+ CC_FOR_BUILD=gcc
-+ fi
-+fi
-+AC_SUBST(CC_FOR_BUILD)
-+# Also set EXEEXT_FOR_BUILD.
-+if test "x$cross_compiling" = "xno"; then
-+ EXEEXT_FOR_BUILD='$(EXEEXT)'
-+else
-+ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
-+ [rm -f conftest*
-+ echo 'int main () { return 0; }' > conftest.c
-+ bfd_cv_build_exeext=
-+ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
-+ for file in conftest.*; do
-+ case $file in
-+ *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-+ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
-+ esac
-+ done
-+ rm -f conftest*
-+ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
-+ EXEEXT_FOR_BUILD=""
-+ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
-+fi
-+AC_SUBST(EXEEXT_FOR_BUILD)])dnl
base-commit: cede908fcd7c7aace780165d0dd9f673ddf3fc87
--
2.34.1
Andy Tai <atai@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#75274; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.