Skip to contentSkip to conversation

package/bc: bump to 1.07.1

PATCH New Matt Weber 2 participants 2 messages Sep 13, 2019 – Sep 15, 2019

lore
Share & tools
lore

Matt Weber

author
#0 lore raw

PATCH v2 1/1 package/bc: bump to 1.07.1

* Added license hash files
* Updated site to new GNU location
* Reconfig required to use newer automake
* Dropped patch for 01_array_initialize.patch as it was fixed
* Refactored patches for makeinfo variable and write io errs
* Added new dc fix exit code patch from Debian sid
* Added new libmath offline gen cross-compile patch from Yocto

Upstream patch status: Pending

---
Email sent direct to philnelson at acm.org for the following.
0001-bc-use-MAKEINFO-variable-for-docs.patch 0002-notice-read-and-write-errors-on-input-and-output.patch 0003-dc-fix-exit-code-of-q-command.patch Discussion of libmath.h cross-compiling bug

Changes
v1 -> v2
[Thomas P
- Moved MAKEINFO variable fixup to Makefile.am as it was getting overwritten during the autoreconf of the Makefile.in
- Updated comments in bc.mk to note the real reason we autoreconf
- Added upsteam patch status notes above.

---
 ...01-bc-use-MAKEINFO-variable-for-docs.patch |  35 ++
 ...nd-write-errors-on-input-and-output.patch} | 350 ++++++++++--------
 .../0003-dc-fix-exit-code-of-q-command.patch  |  46 +++
 package/bc/0004-no-gen-libmath.patch          |  97 +++++
 package/bc/01_array_initialize.patch          |  20 -
 package/bc/03_use_appropiate_makeinfo.patch   |  17 -
 package/bc/bc.hash                            |   4 +-
 package/bc/bc.mk                              |  10 +-
 8 files changed, 386 insertions(+), 193 deletions(-)
 create mode 100644 package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch
 rename package/bc/{02_notice_read_write_errors.patch => 0002-notice-read-and-write-errors-on-input-and-output.patch} (63%)
 create mode 100644 package/bc/0003-dc-fix-exit-code-of-q-command.patch
 create mode 100644 package/bc/0004-no-gen-libmath.patch
 delete mode 100644 package/bc/01_array_initialize.patch
 delete mode 100644 package/bc/03_use_appropiate_makeinfo.patch
package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch new file +35 -0
new file mode 100644
index 0000000000..03d15f5524
@@ -0,0 +1,35 @@
+From 7dc22308b2974fd093b6a564b7b28ddc20ddf4a6 Mon Sep 17 00:00:00 2001
+From: Matt Weber <[email protected]>
+Date: Fri, 13 Sep 2019 13:45:02 -0500
+Subject: [PATCH] bc: use MAKEINFO variable for docs
+
+Use the appropiate MAKEINFO variable rather than the hardcoded makeinfo
+command directly, otherwise missing logic never works.
+
+Fixes:
+http://autobuild.buildroot.net/results/b0b/b0b9dced0014a5a8026fa972f95085e8bd16a07b/
+
+[Recreated for 1.0.7.1 by Matt W and applied to Makefile.am instead of
+ Makefile.in]
+Signed-off-by: Gustavo Zacarias <[email protected]>
+Signed-off-by: Matthew Weber <[email protected]>
+---
+ doc/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 1bdc478..f873b6a 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ info_TEXINFOS = bc.texi dc.texi
+-MAKEINFO = makeinfo --no-split
++MAKEINFO = @MAKEINFO@ --no-split
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-- 
+2.17.1
+
package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch renamed from package/bc/02_notice_read_write_errors.patch +198 -152

756 lines not on this page · raw message

package/bc/0003-dc-fix-exit-code-of-q-command.patch new file +46 -0

46 lines not on this page · raw message

package/bc/0004-no-gen-libmath.patch new file +97 -0

97 lines not on this page · raw message

package/bc/01_array_initialize.patch deleted +0 -20
deleted file mode 100644
index 9520d824af..0000000000
@@ -1,20 +0,0 @@
-Description: Fix array initialization bug
-Author: Phil Nelson
-Origin: upstream
-Bug-Debian: http://bugs.debian.org/586969
-Bug-Debian: http://bugs.debian.org/671513
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: bc/bc/storage.c
-===================================================================
---- bc.orig/bc/storage.c	2013-06-02 20:34:09.401273864 -0400
-+++ bc/bc/storage.c	2013-06-02 20:34:11.000000000 -0400
-@@ -179,7 +179,7 @@
- 
- 
-   /* Initialize the new elements. */
--  for (; indx < v_count; indx++)
-+  for (; indx < a_count; indx++)
-     arrays[indx] = NULL;
- 
-   /* Free the old elements. */
package/bc/03_use_appropiate_makeinfo.patch deleted +0 -17
deleted file mode 100644
index e6f9262b09..0000000000
@@ -1,17 +0,0 @@
-Use the appropiate MAKEINFO variable rather than the hardcoded makeinfo
-command directly, otherwise missing logic never works.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura bc-1.06.95.orig/doc/Makefile.in bc-1.06.95/doc/Makefile.in
---- bc-1.06.95.orig/doc/Makefile.in	2015-06-13 09:39:46.946620294 -0300
-+++ bc-1.06.95/doc/Makefile.in	2015-06-13 09:40:10.019407630 -0300
-@@ -96,7 +96,7 @@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LTLIBOBJS = @LTLIBOBJS@
--MAKEINFO = makeinfo --no-split
-+MAKEINFO = @MAKEINFO@ --no-split
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
package/bc/bc.hash +3 -1
index 5f1ed63536..6feca831d2 100644
@@ -1,2 +1,4 @@
 # Locally calculated
-sha256 7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc  bc-1.06.95.tar.bz2
+sha256	62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a  bc-1.07.1.tar.gz
+sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
+sha256	a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c  COPYING.LIB
package/bc/bc.mk +7 -3
index ee0e43848b..628b6a7359 100644
@@ -4,11 +4,15 @@
 #
 ################################################################################
 
-BC_VERSION = 1.06.95
-BC_SOURCE = bc-$(BC_VERSION).tar.bz2
-BC_SITE = http://alpha.gnu.org/gnu/bc
+BC_VERSION = 1.07.1
+BC_SOURCE = bc-$(BC_VERSION).tar.gz
+BC_SITE = http://ftp.gnu.org/gnu/bc
 BC_DEPENDENCIES = host-flex
 BC_LICENSE = GPL-2.0+, LGPL-2.1+
 BC_LICENSE_FILES = COPYING COPYING.LIB
 
+# 0001-bc-use-MAKEINFO-variable-for-docs.patch and 0004-no-gen-libmath.patch
+# are patching doc/Makefile.am and Makefile.am respectively
+BC_AUTORECONF = YES
+
 $(eval $(autotools-package))
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 package/bc: bump to 1.07.1

Hello Matt,

Quoted 10 lines · On Fri, 13 Sep 2019 13:57:42 -0500 Matt Weber…

* Added license hash files
* Updated site to new GNU location
* Reconfig required to use newer automake
* Dropped patch for 01_array_initialize.patch as it was fixed
* Refactored patches for makeinfo variable and write io errs
* Added new dc fix exit code patch from Debian sid
* Added new libmath offline gen cross-compile patch from Yocto

Upstream patch status: Pending

Quoted 7 lines

---
Email sent direct to philnelson at acm.org for the following.
0001-bc-use-MAKEINFO-variable-for-docs.patch 0002-notice-read-and-write-errors-on-input-and-output.patch 0003-dc-fix-exit-code-of-q-command.patch Discussion of libmath.h cross-compiling bug

I had to add MAKEINFO=true in BC_CONF_ENV, otherwise the build would fail with:

/home/test/buildroot/output/build/bc-1.07.1/missing: line 81: makeinfo: command not found /home/test/buildroot/output/build/bc-1.07.1/missing: line 81: makeinfo: command not found

on a system with makeinfo not installed.

Applied to master with this change. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com