From patchwork Tue Jul 17 12:25:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 142140 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3592479ljj; Tue, 17 Jul 2018 05:25:20 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfbCWnQQmgC4HNAuiw+EWfXS7cVw3RAnqsrHKh+X8pttepLlRvMouxMNy8x6BqIzjJcux7Q X-Received: by 2002:a62:15c8:: with SMTP id 191-v6mr485045pfv.194.1531830320216; Tue, 17 Jul 2018 05:25:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531830320; cv=none; d=google.com; s=arc-20160816; b=EWTL40P/JHY129kChTCaD+WD2t4TaZmCvhKyDNUo7AxxC/zH9M+By6s0tgKzTVHviB I/Xxpjfh3Re2jxKGyS9xRg3Eq8Zxv6xXjWr/gEILT9N1B33jr8wzXOgjT6yGPb5zxRGa UIuT2BVy/SIpkCeDhLLSykMynQpHBSvUdCb5hLpzocNrRDV779Zd7A6vUsDdQ6E0ejtz r+faXPMmP8+zJBTRYuOJA87FLOojWUxDmNtx5R3O7KzV6qPAkwZt1qAFvwySi3U+cZfP pHmZuTCITaTLzXrsUGcY/vGy6L4+8ytIXBIFW4h6EyZ+1cPmHnJQmByio7ZUQ1pLaKaA n/2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=L/nD385gApm/yJKAbUdgRHo3sugqRltM6SL7F7qXKng=; b=ZGLIFH2aNPaTL285nTrnm8avRC+T0aBEyVgPtzGkxKFe+PjpJ14sIYlz575K8rwORU TBUfFuxWrAZ0OR2a2h+4ysCNe5i/84aQkI9+m+jt7dyulep/f4U2gdjrazOrYzMlnQFc PhgCMBPRTc1XdninhRb4XrOBWfRCpUzKW1IH6NU644n6af45GfzE/jQNZcdGwgKrK90K 2ylBjFxjfmH4C+5ooRdH8kuqhZZ0m2IBJo6qpCCWqMuFXKim5RqC9dkSUqKFxZauCs+L 8qeF3JZsMXUBTigEg5RpqCBRdfwontjI5Xk4Grcue/R2jNggicUbcZU3wieSeXqc50bj VZxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=C9i75w2I; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h126-v6si813949pfb.39.2018.07.17.05.25.19; Tue, 17 Jul 2018 05:25:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=C9i75w2I; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E9791789D7; Tue, 17 Jul 2018 12:25:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by mail.openembedded.org (Postfix) with ESMTP id EA105789D4 for ; Tue, 17 Jul 2018 12:25:14 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id c14-v6so1294827wmb.4 for ; Tue, 17 Jul 2018 05:25:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=BRshqaKld7Io9VSDJsVES7hDsC/hPU2FqJROYA0ofe4=; b=C9i75w2IZv6mUrvWRMtDAUwWf8JA7dScgFTAKHI1pc1wHGhZr6m5JscK6EEpvVYfil i4eFiuoBpzOThw06+rhj6oPgPY1fBgtcJVTVqGFGcHulPReIO/SDlHAu0CtxRF+lfnFQ +gWWck65Ekh2ez5OgDUfRUx7ReUm56Qm8lA6T9kq3jZ80iQVpdmJl6IbfZTGYr6wSqvp u5xFdm+5i613kcWaC3AZUkZnOGBd8XjjWr8F17JKAUgerPg/vA8YvtbnPtfbi+V/dPik fqIdy8Xy4csbqG1x7agRuMA6ENmc8lhgvj7IQRS9/S/4KmAAlZ385bwpmPEbpFL3lan1 i/1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=BRshqaKld7Io9VSDJsVES7hDsC/hPU2FqJROYA0ofe4=; b=UPfdOALlhes6Wdz8TuupxBAIVOLJkL6tXJ9YL2EBfW96Ka6rANRB3S9CYPgcoHrJNE YasHmiNbviM3TkFmsQpiR6pK/mGPg7xu3Wiub8QYR6pQG/imfTflXJ0RZ1jiaKjXvOvj EIxgfXkdsh0m0bZFrQ7qn+J5xuCOHSOyTkTW74YdW6DQ5hqOYE1eMrcMlqPn63xZaybo DxrAEvbeN9rgzobwPjdaGLm+Rm5V4r8RlCnaKSRnNY0r2+pOzPlmsDSvIA0n835cl3rP JPqXHkAguDo4A+vAWMHcBHwePB4+tDpf3ZJ8ELWQapTu5Cy272Kw9vjlpTFrahiP0ca5 ho7w== X-Gm-Message-State: AOUpUlGISIf0/OMb7nAM5pUbXVo+D7jet7dJ6hceJeorTOsWSldICAXN FfvSUoQqs6etrXiMUCVKtidUT99P X-Received: by 2002:a1c:4004:: with SMTP id n4-v6mr1205791wma.83.1531830314991; Tue, 17 Jul 2018 05:25:14 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id z62-v6sm807241wmc.10.2018.07.17.05.25.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 05:25:14 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 17 Jul 2018 13:25:12 +0100 Message-Id: <20180717122512.20210-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] bc: upgrade to 1.07.1 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Relicensed to just GPLv3+, update LICENSE and checksums. The build dependency for flex should be flex-native. libmath.h is missing from the tarball (it was present in 1.06) and the generation rules are not cross-friendly, so delete the rules and copy in a pre-generated libmath.h. Remove fix-segment-fault.patch as the fixes are now upstream. Add PACKAGECONFIG for readline and libedit, defaulting to readline. Signed-off-by: Ross Burton --- meta/recipes-extended/bc/bc/libmath.h | 46 ++++++++++++++++++++++ meta/recipes-extended/bc/bc/no-gen-libmath.patch | 24 +++++++++++ meta/recipes-extended/bc/bc_1.06.bb | 26 ------------ meta/recipes-extended/bc/bc_1.07.1.bb | 33 ++++++++++++++++ .../bc/files/fix-segment-fault.patch | 28 ------------- 5 files changed, 103 insertions(+), 54 deletions(-) create mode 100644 meta/recipes-extended/bc/bc/libmath.h create mode 100644 meta/recipes-extended/bc/bc/no-gen-libmath.patch delete mode 100644 meta/recipes-extended/bc/bc_1.06.bb create mode 100644 meta/recipes-extended/bc/bc_1.07.1.bb delete mode 100644 meta/recipes-extended/bc/files/fix-segment-fault.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/bc/bc/libmath.h b/meta/recipes-extended/bc/bc/libmath.h new file mode 100644 index 00000000000..63e1acb9ef5 --- /dev/null +++ b/meta/recipes-extended/bc/bc/libmath.h @@ -0,0 +1,46 @@ +{"@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.06.bb b/meta/recipes-extended/bc/bc_1.06.bb deleted file mode 100644 index d8c8a860f81..00000000000 --- a/meta/recipes-extended/bc/bc_1.06.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Arbitrary precision calculator language" -HOMEPAGE = "http://www.gnu.org/software/bc/bc.html" - -LICENSE = "GPLv2+ & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ - file://bc/bcdefs.h;endline=31;md5=46dffdaf10a99728dd8ce358e45d46d8 \ - file://dc/dc.h;endline=25;md5=2f9c558cdd80e31b4d904e48c2374328 \ - file://lib/number.c;endline=31;md5=99434a0898abca7784acfd36b8191199" - -SECTION = "base" -DEPENDS = "flex" -PR = "r3" - -SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \ - file://fix-segment-fault.patch " - -SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117" -SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33" - -inherit autotools texinfo update-alternatives - -ALTERNATIVE_${PN} = "dc" -ALTERNATIVE_PRIORITY = "100" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb new file mode 100644 index 00000000000..e80857745ea --- /dev/null +++ b/meta/recipes-extended/bc/bc_1.07.1.bb @@ -0,0 +1,33 @@ +SUMMARY = "Arbitrary precision calculator language" +HOMEPAGE = "http://www.gnu.org/software/bc/bc.html" + +LICENSE = "GPLv3+" +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://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" +SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc" +SRC_URI[sha256sum] = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a" + +inherit autotools texinfo update-alternatives + +PACKAGECONFIG ??= "readline" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" + +do_compile_prepend() { + cp -f ${WORKDIR}/libmath.h ${B}/bc/libmath.h +} + +ALTERNATIVE_${PN} = "dc" +ALTERNATIVE_PRIORITY = "100" + +BBCLASSEXTEND = "native" \ No newline at end of file diff --git a/meta/recipes-extended/bc/files/fix-segment-fault.patch b/meta/recipes-extended/bc/files/fix-segment-fault.patch deleted file mode 100644 index 20c0da2ebe3..00000000000 --- a/meta/recipes-extended/bc/files/fix-segment-fault.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Pending - -when run command such as 'echo "a = 13" | bc -l', it segmentation faults. -This patch is from http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg04602.html. - -Signed-off-by: Kai Kang - ---- bc-1.06/lib/number.c.orig 2003-09-26 21:14:02.000000000 +0000 -+++ bc-1.06/lib/number.c 2003-09-26 21:14:26.000000000 +0000 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include /* Prototypes needed for external utility routines. */ - - #define bc_rt_warn rt_warn ---- bc-1.06/bc/load.c.orig 2003-09-26 21:14:14.000000000 +0000 -+++ bc-1.06/bc/load.c 2003-09-26 21:14:26.000000000 +0000 -@@ -156,7 +156,7 @@ - long label_no; - long vaf_name; /* variable, array or function number. */ - long func; -- program_counter save_adr; -+ static program_counter save_adr; - - /* Initialize. */ - str = code;