aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorStefan Eßer <se@FreeBSD.org>2020-12-27 20:53:09 +0000
committerStefan Eßer <se@FreeBSD.org>2020-12-27 21:32:22 +0000
commite458944cf9deec51d03ec751050a58ddf43e796f (patch)
tree94dba810b1ef5180bd0d25da06152eaff01c9a44 /contrib
parent50fcb4ee771cabbae99bb3150b26484f3e573fab (diff)
downloadsrc-e458944cf9deec51d03ec751050a58ddf43e796f.tar.gz
src-e458944cf9deec51d03ec751050a58ddf43e796f.zip
Import bc 3.2.4
Diffstat (limited to 'contrib')
-rw-r--r--contrib/bc/.travis.yml42
-rw-r--r--contrib/bc/Makefile.in2
-rw-r--r--contrib/bc/NEWS.md7
-rw-r--r--contrib/bc/README.md8
-rw-r--r--contrib/bc/codecov.yml3
-rw-r--r--contrib/bc/include/status.h4
-rwxr-xr-xcontrib/bc/release.sh4
7 files changed, 14 insertions, 56 deletions
diff --git a/contrib/bc/.travis.yml b/contrib/bc/.travis.yml
deleted file mode 100644
index 91694a821284..000000000000
--- a/contrib/bc/.travis.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-dist: bionic
-
-language: c
-
-arch:
- - amd64
- - arm64
- - ppc64le
-
-compiler:
- - gcc
-
-env:
- global:
- - CODECOV_TOKEN="040ce7eb-5bc7-4040-8324-364f3ef4baa3"
- - CFLAGS="-coverage -DBC_RAND_BUILTIN=0"
- matrix:
- - CONFIGURE_ARGS=-fHNPOg GEN_HOST=1 LONG_BIT=64
- - CONFIGURE_ARGS=-bfHNPOg GEN_HOST=1 LONG_BIT=64
- - CONFIGURE_ARGS=-dfHNPOg GEN_HOST=1 LONG_BIT=64
- - CONFIGURE_ARGS=-fEHNPOg GEN_HOST=1 LONG_BIT=64
- - CONFIGURE_ARGS=-bfEHNPOg GEN_HOST=1 LONG_BIT=64
- - CONFIGURE_ARGS=-dfEHNPOg GEN_HOST=1 LONG_BIT=64
- - CONFIGURE_ARGS=-fHNPOg GEN_HOST=1 LONG_BIT=32
- - CONFIGURE_ARGS=-bfHNPOg GEN_HOST=1 LONG_BIT=32
- - CONFIGURE_ARGS=-dfHNPOg GEN_HOST=1 LONG_BIT=32
- - CONFIGURE_ARGS=-fEHNPOg GEN_HOST=1 LONG_BIT=32
- - CONFIGURE_ARGS=-bfEHNPOg GEN_HOST=1 LONG_BIT=32
- - CONFIGURE_ARGS=-dfEHNPOg GEN_HOST=1 LONG_BIT=32
-
-before_install:
- - sudo apt-get install -y dc
- - pip install --user codecov
-
-before_script:
- - curl -o tests/bc/scripts/timeconst.bc https://raw.githubusercontent.com/torvalds/linux/master/kernel/time/timeconst.bc
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
-
-script:
- - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./configure.sh "$CONFIGURE_ARGS" && make -j4 && make -j4 test ; fi
diff --git a/contrib/bc/Makefile.in b/contrib/bc/Makefile.in
index 968494e4a8a0..d17e74163397 100644
--- a/contrib/bc/Makefile.in
+++ b/contrib/bc/Makefile.in
@@ -29,7 +29,7 @@
#
.POSIX:
-VERSION = 3.2.3
+VERSION = 3.2.4
SRC = %%SRC%%
OBJ = %%OBJ%%
diff --git a/contrib/bc/NEWS.md b/contrib/bc/NEWS.md
index db8448d48a86..f4fc2f5779ce 100644
--- a/contrib/bc/NEWS.md
+++ b/contrib/bc/NEWS.md
@@ -1,5 +1,12 @@
# News
+## 3.2.4
+
+This is a production release that fixes a warning on `gcc` 6 or older, which
+does not have an attribute that is used.
+
+Users do ***NOT*** need to upgrade if they don't use `gcc` 6 or older.
+
## 3.2.3
This is a production release that fixes a bug in `gen/strgen.sh`. I recently
diff --git a/contrib/bc/README.md b/contrib/bc/README.md
index cea5d877b95c..6f3c3f252cbc 100644
--- a/contrib/bc/README.md
+++ b/contrib/bc/README.md
@@ -1,7 +1,5 @@
# `bc`
-[![Build Status][13]][14]
-[![codecov][15]][16]
[![Coverity Scan Build Status][17]][18]
***WARNING: This project has moved to [https://git.yzena.com/][20] for [these
@@ -302,8 +300,6 @@ tarballs.
Files:
.gitignore The git ignore file (maintainer use only).
- .travis.yml The Travis CI file (maintainer use only).
- codecov.yml The Codecov file (maintainer use only).
configure A symlink to configure.sh to make packaging easier.
configure.sh The configure script.
functions.sh A script with functions used by other scripts.
@@ -339,10 +335,6 @@ Folders:
[10]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
[11]: http://semver.org/
[12]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/bc.html
-[13]: https://travis-ci.com/gavinhoward/bc.svg?branch=master
-[14]: https://travis-ci.com/gavinhoward/bc
-[15]: https://codecov.io/gh/gavinhoward/bc/branch/master/graph/badge.svg
-[16]: https://codecov.io/gh/gavinhoward/bc
[17]: https://img.shields.io/coverity/scan/16609.svg
[18]: https://scan.coverity.com/projects/gavinhoward-bc
[19]: ./manuals/benchmarks.md
diff --git a/contrib/bc/codecov.yml b/contrib/bc/codecov.yml
deleted file mode 100644
index 396c77d9c20a..000000000000
--- a/contrib/bc/codecov.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-ignore:
- - "src/history/history.c"
- - "gen/strgen.c"
diff --git a/contrib/bc/include/status.h b/contrib/bc/include/status.h
index 762ff3e25c36..2807a28af4ef 100644
--- a/contrib/bc/include/status.h
+++ b/contrib/bc/include/status.h
@@ -166,7 +166,11 @@ typedef enum BcErr {
#endif // __STDC_VERSION__
#if defined(__clang__) || defined(__GNUC__)
+#if defined(__has_attribute) && __has_attribute(fallthrough)
#define BC_FALLTHROUGH __attribute__((fallthrough));
+#else // defined(__has_attribute) && __has_attribute(fallthrough)
+#define BC_FALLTHROUGH
+#endif // defined(__has_attribute) && __has_attribute(fallthrough)
#else // defined(__clang__) || defined(__GNUC__)
#define BC_FALLTHROUGH
#endif //defined(__clang__) || defined(__GNUC__)
diff --git a/contrib/bc/release.sh b/contrib/bc/release.sh
index bd9c33e55da6..2cb39f6b38c5 100755
--- a/contrib/bc/release.sh
+++ b/contrib/bc/release.sh
@@ -573,8 +573,8 @@ if [ "$run_tests" -ne 0 ]; then
printf '\n'
printf 'Then run the GitHub release script as follows:\n'
printf '\n'
- printf ' <github_release> %s .travis.yml codecov.yml release.sh \\\n' "$version"
- printf ' RELEASE.md tests/afl.py tests/radamsa.sh tests/radamsa.txt tests/randmath.py \\\n'
+ printf ' <github_release> %s release.sh RELEASE.md\\\n' "$version"
+ printf ' tests/afl.py tests/radamsa.sh tests/radamsa.txt tests/randmath.py \\\n'
printf ' tests/bc/scripts/timeconst.bc\n'
fi