From: Alexander Kanavin Date: Wed, 8 Jan 2025 08:42:12 +0000 (+0100) Subject: bc: update 1.07.1 -> 1.08.1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab7c33ba324af89a0f96d9eb480ce422f3b92fb5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git bc: update 1.07.1 -> 1.08.1 Upstream now ships pre-generated libmath.h, so we don't need to do so. Drop 0001-dc-fix-exit-code-of-q-command.patch (merged upstream). License-update: copyright years. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch b/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch deleted file mode 100644 index 1ef797dd66a..00000000000 --- a/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e174b6e7d195d5a7465575641b7f68581f162574 Mon Sep 17 00:00:00 2001 -From: Li Zhou -Date: Thu, 27 Jun 2019 13:10:47 +0800 -Subject: [PATCH] dc: fix exit code of q command - -The exit code for "echo q | dc" is 1 for dc-1.4.1; -while the exit code for "echo q | dc" is 0 for dc-1.4. - -Here is the answer from ken@gnu.org: -dc-1.4 was right. There was a rewrite of a chunk of code for 1.4.1 to -fix a corner case in the Q command, and somehow the placement of the -clean-up label for the 'q' command got misplaced on the error-handling -branch instead of the clean-exit branch. The patch below fixes this -(it is committed for whenever the next bc/dc release gets made). - -Thanks for the report, - --Ken Pizzini - -Upstream-Status: Backport [Got the solution from maintainer] - -Signed-off-by: Li Zhou ---- - dc/eval.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dc/eval.c b/dc/eval.c -index 05a3d9e..bcab8db 100644 ---- a/dc/eval.c -+++ b/dc/eval.c -@@ -814,10 +814,10 @@ error_fail: - fprintf(stderr, "%s: ", progname); - perror("error reading input"); - return DC_FAIL; --reset_and_exit_quit: - reset_and_exit_fail: - signal(SIGINT, sigint_default); - return DC_FAIL; -+reset_and_exit_quit: - reset_and_exit_success: - signal(SIGINT, sigint_default); - return DC_SUCCESS; --- -1.9.1 - diff --git a/meta/recipes-extended/bc/bc/libmath.h b/meta/recipes-extended/bc/bc/libmath.h deleted file mode 100644 index 63e1acb9ef5..00000000000 --- a/meta/recipes-extended/bc/bc/libmath.h +++ /dev/null @@ -1,46 +0,0 @@ -{"@iK20:s2:p@r", -"@iF1,5.6,7,8,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C1,0:", -"s14:pl7:s0:pl14:RN1:l5:0Z4:l10:1+s10:pl5:K2:/s5:pl2:", -"1+s2:pJ3:N4:l13:s2:p1l5:+s14:pl5:s6:p1s8:pK2:s11:pN6:1B7:J5:N8:", -"l11:i11:pJ6:N7:l6:l5:*s6:l8:l11:*s8:/s9:pl9:0=Z9:l10:0>Z10:N11:", -"l10:d10:Z12:l14:l14:*s14:pJ11:N12:N10:l15:s2:pl12:Z13:1l14:/R", -"N13:l14:1/RN9:l14:l9:+s14:pJ8:N5:0R]@r", -"@iF2,5.7,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C2,0:", -"s14:pl7:s0:pl14:RN1:l5:0{Z2:1K10:l2:^-1/RN2:l2:s15:pK6:l2:+s2:", -"pK2:s10:p0s11:pN3:l5:K2:}Z4:l10:K2:*s10:pl5:cRs5:pJ3:N4:N5:l5:", -"K.5:{Z6:l10:K2:*s10:pl5:cRs5:pJ5:N6:l5:1-l5:1+/s13:s14:pl13:l13:", -"*s12:pK3:s11:pN8:1B9:J7:N10:l11:K2:+s11:pJ8:N9:l13:l12:*s13:l11:", -"/s9:pl9:0=Z11:l10:l14:*s14:pl15:s2:pl14:1/RN11:l14:l9:+s14:pJ10:N7:", -"0R]@r", -"@iF3,5.7,9,11,12,13,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C3,0:", -"s14:pl7:s0:pl14:RN1:l2:s15:pK1.1:l15:*K2:+s2:p1C4,0:s14:pl5:0", -"Z11:l15:K5:+s2:pK.2:C4,0:s6:pN11:", -"l15:K3:+s2:pN12:l5:K.2:>Z13:l10:1+s10:pl5:K.2:-1l5:K.2:*+/s5:", -"pJ12:N13:l5:s13:s14:pl5:nl5:*s16:pK3:s11:pN15:1B16:J14:N17:l11:", -"K2:+s11:pJ15:N16:l13:l16:*s13:l11:/s9:pl9:0=Z18:l15:s2:pl10:l6:", -"*l14:+l12:/RN18:l14:l9:+s14:pJ17:N14:0R]@r", -"@iF6,13,5.6,7,8,9,10,11,12,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl13:", -"l5:C6,00:s14:pl7:s0:pl14:RN1:l2:s15:p0s2:pl13:1/s13:pl13:0 - -diff --git a/bc/Makefile.am b/bc/Makefile.am -index d9d412e..f244241 100644 ---- a/bc/Makefile.am -+++ b/bc/Makefile.am -@@ -31,14 +31,6 @@ global.o: libmath.h - - fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.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 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 - sbc.o: sbc.c diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.08.1.bb similarity index 72% rename from meta/recipes-extended/bc/bc_1.07.1.bb rename to meta/recipes-extended/bc/bc_1.08.1.bb index 74387c50abe..473d78d8a77 100644 --- a/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/meta/recipes-extended/bc/bc_1.08.1.bb @@ -6,19 +6,15 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://bc/bcdefs.h;endline=17;md5=4295c06df9e833519a342f7b5d43db06 \ - file://dc/dc.h;endline=18;md5=36b8c600b63ee8c3aeade2764f6b2a4b \ + file://dc/dc.h;endline=18;md5=bad31533d57fe5948c996f9ef6643206 \ file://lib/number.c;endline=20;md5=cf43068cc88f837731dc53240456cfaf" SECTION = "base" DEPENDS = "flex-native" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - file://no-gen-libmath.patch \ - file://libmath.h \ - file://0001-dc-fix-exit-code-of-q-command.patch \ file://run-ptest" -SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc" -SRC_URI[sha256sum] = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a" +SRC_URI[sha256sum] = "b71457ffeb210d7ea61825ff72b3e49dc8f2c1a04102bbe23591d783d1bfe996" inherit autotools texinfo update-alternatives ptest @@ -26,10 +22,6 @@ PACKAGECONFIG ??= "readline" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" -do_compile:prepend() { - cp -f ${UNPACKDIR}/libmath.h ${B}/bc/libmath.h -} - do_install_ptest() { install ${S}/Test/*.b ${D}${PTEST_PATH} }