Package: guix-patches;
Reported by: Andy Tai <atai <at> atai.org>
Date: Thu, 2 Jan 2025 03:31:02 UTC
Severity: normal
Tags: patch
To reply to this bug, email your comments to 75274 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#75274; Package guix-patches.
(Thu, 02 Jan 2025 03:31:02 GMT) Full text and rfc822 format available.Andy Tai <atai <at> atai.org>:guix-patches <at> gnu.org.
(Thu, 02 Jan 2025 03:31:03 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: guix-patches <at> gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH] gnu: bc: Update to 1.08.0 Date: Wed, 1 Jan 2025 19:30:18 -0800
* 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 <at> gnu.org.
-
-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 <at> sc3d.org>
-+# Copyright (c) 1999 Richard Henderson <rth <at> redhat.com>
-+#
-+# 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
guix-patches <at> gnu.org:bug#75274; Package guix-patches.
(Mon, 06 Jan 2025 04:45:02 GMT) Full text and rfc822 format available.Message #8 received at 75274 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 75274 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v2] gnu: bc: Update to 1.08.1. Date: Sun, 5 Jan 2025 20:44:10 -0800
* 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 <at> gnu.org.
-
-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 <at> sc3d.org>
-+# Copyright (c) 1999 Richard Henderson <rth <at> redhat.com>
-+#
-+# 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
andreas <at> enge.fr, bavier <at> posteo.net, sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#75274; Package guix-patches.
(Mon, 26 May 2025 22:34:02 GMT) Full text and rfc822 format available.Message #11 received at 75274 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 75274 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v3] gnu: bc: Update to 1.08.2. Date: Mon, 26 May 2025 15:33:21 -0700
* gnu/packages/algebra.scm (bc): Update to 1.08.2.
[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 | 9 +-
.../patches/bc-fix-cross-compilation.patch | 189 ------------------
3 files changed, 4 insertions(+), 195 deletions(-)
delete mode 100644 gnu/packages/patches/bc-fix-cross-compilation.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index cb2630381c..a78cff64ce 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1041,7 +1041,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 f928e7943c..bb29c69747 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -709,19 +709,18 @@ (define-public gmp-ecm
(define-public bc
(package
(name "bc")
- (version "1.07.1")
+ (version "1.08.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz"))
(sha256
(base32
- "0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2"))
- (patches (search-patches "bc-fix-cross-compilation.patch"))))
+ "11jzg23ks39k58bnb5y55wxqqz6h534ys5900hz6axcp8bn0yixf"))))
(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")
@@ -737,7 +736,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 <at> gnu.org.
-
-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 <at> sc3d.org>
-+# Copyright (c) 1999 Richard Henderson <rth <at> redhat.com>
-+#
-+# 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: 04eef950af05444ce42682364041dcbd3fa7afd5
--
2.43.0
guix-patches <at> gnu.org:bug#75274; Package guix-patches.
(Tue, 03 Jun 2025 17:13:03 GMT) Full text and rfc822 format available.Message #14 received at 75274 <at> debbugs.gnu.org (full text, mbox):
From: Eric Bavier <bavier <at> posteo.net> To: Andy Tai <atai <at> atai.org>, 75274 <at> debbugs.gnu.org Cc: Andreas Enge <andreas <at> enge.fr>, Sharlatan Hellseher <sharlatanus <at> gmail.com> Subject: Re: [bug#75274] [PATCH v3] gnu: bc: Update to 1.08.2. Date: Tue, 3 Jun 2025 17:12:08 +0000
[Message part 1 (text/plain, inline)]
Hi Andy, On 5/26/25 17:33, Andy Tai wrote: > * gnu/packages/algebra.scm (bc): Update to 1.08.2. > [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 | 9 +- > .../patches/bc-fix-cross-compilation.patch | 189 ------------------ > 3 files changed, 4 insertions(+), 195 deletions(-) > delete mode 100644 gnu/packages/patches/bc-fix-cross-compilation.patch Thanks for the patch. I've checked this doesn't introduce any regressions (package itself builds for x86_64, i686, and aarch64, as well as x86_64 dependents that don't already FTBFS), and it's nice to be able to drop the cross-build patch. We have about 3,500 packages that depend on bc, including several web browsers, so we'll probably need to find a suitable staging branch to apply this patch to. `~Eric
[OpenPGP_0x34532F9FAFCA8B8E.asc (application/pgp-keys, attachment)]
[OpenPGP_signature.asc (application/pgp-signature, attachment)]
guix-patches <at> gnu.org:bug#75274; Package guix-patches.
(Wed, 04 Jun 2025 08:30:02 GMT) Full text and rfc822 format available.Message #17 received at 75274 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: Eric Bavier <bavier <at> posteo.net> Cc: 75274 <at> debbugs.gnu.org, Andreas Enge <andreas <at> enge.fr>, Sharlatan Hellseher <sharlatanus <at> gmail.com> Subject: Re: [bug#75274] [PATCH v3] gnu: bc: Update to 1.08.2. Date: Wed, 4 Jun 2025 01:28:47 -0700
Eric, how to request a staging branch? Or this can take a ride on the core-package-team branch? Thanks On Tue, Jun 3, 2025 at 10:12 AM Eric Bavier <bavier <at> posteo.net> wrote: > We have about 3,500 packages that depend on bc, including several web > browsers, so we'll probably need to find a suitable staging branch to > apply this patch to. > > `~Eric
guix-patches <at> gnu.org:bug#75274; Package guix-patches.
(Wed, 04 Jun 2025 15:03:01 GMT) Full text and rfc822 format available.Message #20 received at 75274 <at> debbugs.gnu.org (full text, mbox):
From: Eric Bavier <bavier <at> posteo.net> To: Andy Tai <atai <at> atai.org> Cc: 75274 <at> debbugs.gnu.org, Andreas Enge <andreas <at> enge.fr>, Sharlatan Hellseher <sharlatanus <at> gmail.com> Subject: Re: [bug#75274] [PATCH v3] gnu: bc: Update to 1.08.2. Date: Wed, 4 Jun 2025 15:01:53 +0000
[Message part 1 (text/plain, inline)]
The core-package-team branch would be appropriate, given the presence of web browsers in the dependents. And afaict there are no big user features in the latest version that would need to be released timely? `~Eric On 6/4/25 03:28, Andy Tai wrote: > Eric, how to request a staging branch? Or this can take a ride on the > core-package-team branch? Thanks > > On Tue, Jun 3, 2025 at 10:12 AM Eric Bavier <bavier <at> posteo.net> wrote: >> We have about 3,500 packages that depend on bc, including several web >> browsers, so we'll probably need to find a suitable staging branch to >> apply this patch to. >> >> `~Eric
[OpenPGP_0x34532F9FAFCA8B8E.asc (application/pgp-keys, attachment)]
[OpenPGP_signature.asc (application/pgp-signature, attachment)]
andreas <at> enge.fr, bavier <at> posteo.net, sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#75274; Package guix-patches.
(Thu, 05 Jun 2025 05:10:03 GMT) Full text and rfc822 format available.Message #23 received at 75274 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 75274 <at> debbugs.gnu.org, andreas <at> enge.fr, sharlatanus <at> gmail.com, bavier <at> posteo.net Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH core-packages-team v4] gnu: bc: Update to 1.08.2. Date: Wed, 4 Jun 2025 22:08:54 -0700
* gnu/packages/algebra.scm (bc): Update to 1.08.2.
[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 | 9 +-
.../patches/bc-fix-cross-compilation.patch | 189 ------------------
3 files changed, 4 insertions(+), 195 deletions(-)
delete mode 100644 gnu/packages/patches/bc-fix-cross-compilation.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 0d9711b866..c95555c257 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1039,7 +1039,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 41401ff2a7..c1ba022d41 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -714,19 +714,18 @@ (define-public gmp-ecm
(define-public bc
(package
(name "bc")
- (version "1.07.1")
+ (version "1.08.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz"))
(sha256
(base32
- "0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2"))
- (patches (search-patches "bc-fix-cross-compilation.patch"))))
+ "11jzg23ks39k58bnb5y55wxqqz6h534ys5900hz6axcp8bn0yixf"))))
(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")
@@ -742,7 +741,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 <at> gnu.org.
-
-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 <at> sc3d.org>
-+# Copyright (c) 1999 Richard Henderson <rth <at> redhat.com>
-+#
-+# 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: c06805c59fce8ff951fe9e24029daa41caf07de9
--
2.43.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.