From 518b8fb29255a3ebdeb361ce3df6519b24c44103 Mon Sep 17 00:00:00 2001 From: Brendan Coles Date: Mon, 25 Oct 2021 08:14:27 +0000 Subject: [PATCH] Ports: Bump bc from version 2.5.1 to 5.1.1 --- Ports/AvailablePorts.md | 2 +- Ports/bc/package.sh | 7 +++---- Ports/bc/patches/fix-args.patch | 11 ----------- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 Ports/bc/patches/fix-args.patch diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 3ed6887c57..539f897a60 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -8,7 +8,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`angband`](angband/) | Angband | 4.2.3 | https://rephial.org | | [`bash`](bash/) | GNU Bash | 5.1.8 | https://www.gnu.org/software/bash/ | | [`bass`](bass/) | Beneath a Steel Sky | cd-1.2 | https://www.scummvm.org/games | -| [`bc`](bc/) | bc | 2.5.1 | https://github.com/gavinhoward/bc | +| [`bc`](bc/) | bc | 5.1.1 | https://github.com/gavinhoward/bc | | [`binutils`](binutils/) | GNU Binutils | 2.37 | https://www.gnu.org/software/binutils/ | | [`bison`](bison/) | GNU Bison | 1.25 | https://www.gnu.org/software/bison/ | | [`brogue`](brogue/) | BrogueCE | 1.9.3 | https://github.com/tmewett/BrogueCE | diff --git a/Ports/bc/package.sh b/Ports/bc/package.sh index b1809718a5..4c7f5c8fe2 100755 --- a/Ports/bc/package.sh +++ b/Ports/bc/package.sh @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash ../.port_include.sh port=bc -version=2.5.1 +version=5.1.1 files="https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz bc-${version}.tar.xz https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz.sig bc-${version}.tar.xz.sig" useconfigure=true @@ -8,9 +8,8 @@ configscript=configure.sh auth_type="sig" auth_import_key="E2A30324A4465A4D5882692EC08038BDF280D33E" auth_opts=("bc-${version}.tar.xz.sig") +configopts=("--prefix=/usr/local" "--disable-nls" "--disable-history") configure() { - # NLS needs many things, none of which we support. - # History needs FIONREAD ioctl, which we don't support yet. - run env HOSTCC=gcc ./"$configscript" --disable-nls --disable-history + run env HOSTCC=gcc ./"$configscript" "${configopts[@]}" } diff --git a/Ports/bc/patches/fix-args.patch b/Ports/bc/patches/fix-args.patch deleted file mode 100644 index f951d462ff..0000000000 --- a/Ports/bc/patches/fix-args.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bc-2.5.1/include/args.h.orig Fri Jan 24 19:27:06 2020 -+++ bc-2.5.1/include/args.h Fri Jan 24 19:27:14 2020 -@@ -36,6 +36,8 @@ - #ifndef BC_ARGS_H - #define BC_ARGS_H - -+#include -+ - #include - #include -