diff options
author | Stefan Eßer <se@FreeBSD.org> | 2020-06-27 12:02:01 +0000 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 2020-06-27 12:02:01 +0000 |
commit | 252884ae7e4760f0e3cb45fdc2fff8fb952251ae (patch) | |
tree | facf5088b89def46e37c0c2a9a25df07f44c3152 /usr.bin | |
parent | 136bdd990bfb441ad3ea7a7bc1092dd95cfa5f53 (diff) | |
download | src-252884ae7e4760f0e3cb45fdc2fff8fb952251ae.tar.gz src-252884ae7e4760f0e3cb45fdc2fff8fb952251ae.zip |
Import new 2-clause BSD licenced implementation of the bc and dc commands
These implementations of the bc and dc programs offer a number of advantages
compared to the current implementations in the FreeBSD base system:
- They do not depend on external large number functions (i.e. no dependency
on OpenSSL or any other large number library)
- They implements all features found in GNU bc/dc (with the exception of
the forking of sub-processes, which the author of this version considers
as a security issue).
- They are significantly faster than the current code in base (more than
2 orders of magnitude in some of my tests, e.g. for 12345^100000).
- They should be fully compatible with all features and the behavior of the
current implementations in FreeBSD (not formally verified).
- They support POSIX message catalogs and come with localized messages in
Chinese, Dutch, English, French, German, Japanese, Polish, Portugueze,
and Russian.
- They offer very detailed man-pages that provide far more information than
the current ones.
The upstream sources contain a large number of tests, which are not
imported with this commit. They could be integrated into our test
framework at a latter time.
Installation of this version is controlled by the option "MK_GH_BC=yes".
This option will be set to yes by default in 13-CURRENT, but will be off
by default in 12-STABLE.
Approved by: imp
Obtained from: https://git.yzena.com/gavin/bc
MFC after: 4 weeks
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D19982
Notes
Notes:
svn path=/head/; revision=362681
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/Makefile | 8 | ||||
-rw-r--r-- | usr.bin/gh-bc/Makefile | 100 |
2 files changed, 106 insertions, 2 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index de7c56d52b03..291f58deff30 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -214,6 +214,12 @@ SUBDIR.${MK_GAMES}+= random .if ${COMPILER_FEATURES:Mc++11} SUBDIR+= dtc .endif +.if ${MK_GH_BC} == "yes" +SUBDIR+= gh-bc +.else +SUBDIR.${MK_OPENSSL}+= bc +SUBDIR.${MK_OPENSSL}+= dc +.endif SUBDIR.${MK_HESIOD}+= hesinfo SUBDIR.${MK_ICONV}+= iconv SUBDIR.${MK_ICONV}+= mkcsmapper @@ -238,9 +244,7 @@ SUBDIR.${MK_NIS}+= ypcat SUBDIR.${MK_NIS}+= ypmatch SUBDIR.${MK_NIS}+= ypwhich SUBDIR.${MK_OPENSSH}+= ssh-copy-id -SUBDIR.${MK_OPENSSL}+= bc SUBDIR.${MK_OPENSSL}+= chkey -SUBDIR.${MK_OPENSSL}+= dc SUBDIR.${MK_OPENSSL}+= newkey SUBDIR.${MK_QUOTAS}+= quota SUBDIR.${MK_SENDMAIL}+= vacation diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile new file mode 100644 index 000000000000..f7718b75e92d --- /dev/null +++ b/usr.bin/gh-bc/Makefile @@ -0,0 +1,100 @@ +# $FreeBSD$ + +.include <src.opts.mk> + +PROG= gh-bc +PROGNAME= bc + +BCDIR= ${SRCTOP}/contrib/${PROGNAME} +BCVERSION!= sed -n -e '/.*VERSION *= *[0-9]/s/.*VERSION *= *//p' ${BCDIR}/Makefile.in + +SRCS= args.c data.c file.c lang.c lex.c main.c num.c parse.c program.c read.c vector.c vm.c +SRCS+= bc/bc.c bc/lex.c bc/parse.c dc/dc.c dc/lex.c dc/parse.c history/history.c +SRCS+= bc_help.c dc_help.c lib.c lib2.c opt.c rand/rand.c +MAN= bc.1 dc.1 + +LINKS= ${BINDIR}/bc ${BINDIR}/dc + +.PATH: ${BCDIR}/src ${BCDIR}/gen ${BCDIR}/manuals ${.OBJDIR} + +CATALOGS= en_US.UTF-8 +CATALOGS+= de_DE.UTF-8 de_DE.ISO8859-1 +CATALOGS+= fr_FR.UTF-8 fr_FR.ISO8859-1 +CATALOGS+= ja_JP.UTF-8 ja_JP.eucJP +CATALOGS+= nl_NL.UTF-8 nl_NL.ISO8859-1 +CATALOGS+= pl_PL.UTF-8 pl_PL.ISO8859-2 +CATALOGS+= pt_PT.UTF-8 pt_PT.ISO8859-1 +CATALOGS+= ru_RU.UTF-8 ru_RU.ISO8859-5 ru_RU.CP1251 ru_RU.CP866 ru_RU.KOI8-R +CATALOGS+= zh_CN.UTF-8 zh_CN.eucCN zh_CN.GB18030 zh_CN.GB2312 zh_CN.GBK + +NLSNAME= bc +NLSSRCDIR= ${BCDIR}/locales + +CFLAGS+= -DMAINEXEC=${PROGNAME} +CFLAGS+= -DNLSPATH=/usr/share/nls/%L/%N.cat +CFLAGS+= -DBC_ENABLED +CFLAGS+= -DBC_ENABLE_PROMPT +CFLAGS+= -DBC_ENABLE_LONG_OPTIONS +CFLAGS+= -DBC_ENABLE_EXTRA_MATH +CFLAGS+= -DBC_ENABLE_HISTORY +CFLAGS+= -DBC_ENABLE_SIGNALS=0 +CFLAGS+= -DBC_NUM_KARATSUBA_LEN=64 +CFLAGS+= -DDC_ENABLED +CFLAGS+= -DNDEBUG +CFLAGS+= -DVERSION=${BCVERSION} +CFLAGS+= -I${BCDIR}/include + +.if ${MK_NLS_CATALOGS} == "no" +CFLAGS+= -DBC_ENABLE_NLS=0 +.else +CFLAGS+= -DBC_ENABLE_NLS=1 + +# prevent floating point incompatibilities caused by -flto on some architectures +.if ${MACHINE_ARCH} != mips && ${MACHINE_ARCH} != mips64 && ${MACHINE_ARCH} != riscv64 +CFLAGS+= -flto +.endif + +.for catalog in ${CATALOGS} +NLS+= ${catalog:C/.*://} +NLSSRCFILES_${catalog:C/.*://}= ${catalog:C/.*://}.msg +.endfor + +NLSLINKS_en_US.UTF-8+= en_AU.UTF-8 en_CA.UTF-8 en_GB.UTF-8 en_IE.UTF-8 \ + en_NZ.UTF-8 C +NLSLINKS_en_US.UTF-8+= en_AU.US-ASCII en_CA.US-ASCII en_GB.US-ASCII \ + en_NZ.US-ASCII +NLSLINKS_en_US.UTF-8+= en_AU.ISO8859-1 en_CA.ISO8859-1 en_GB.ISO8859-1 \ + en_NZ.ISO8859-1 en_US.ISO8859-1 +NLSLINKS_en_US.UTF-8+= en_AU.ISO8859-15 en_CA.ISO8859-15 en_GB.ISO8859-15 \ + en_NZ.ISO8859-15 en_US.ISO8859-15 + +NLSLINKS_de_DE.UTF-8+= de_AT.UTF-8 de_CH.UTF-8 +NLSLINKS_de_DE.ISO8859-1+= de_AT.ISO8859-1 de_CH.ISO8859-1 +NLSLINKS_de_DE.ISO8859-1+= de_AT.ISO8859-15 de_CH.ISO8859-15 de_DE.ISO8859-15 + +NLSLINKS_fr_FR.UTF-8+= fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 +NLSLINKS_fr_FR.ISO8859-1+= fr_BE.ISO8859-1 fr_CA.ISO8859-1 fr_CH.ISO8859-1 +NLSLINKS_fr_FR.ISO8859-1+= fr_BE.ISO8859-15 fr_CA.ISO8859-15 fr_CH.ISO8859-15 \ + fr_FR.ISO8859-15 + +NLSLINKS_nl_NL.ISO8859-1+= nl_BE.ISO8859-1 +NLSLINKS_nl_NL.ISO8859-1+= nl_BE.ISO8859-15 nl_NL.ISO8859-15 + +NLSLINKS_pt_PT.UTF-8+= pt_BR.UTF-8 +NLSLINKS_pt_PT.ISO8859-1+= pt_BR.ISO8859-1 +NLSLINKS_pt_PT.ISO8859-1+= pt_PT.ISO8859-15 +.endif + +lib.c: lib.bc + cd ${BCDIR} && sh gen/strgen.sh gen/lib.bc ${.OBJDIR}/lib.c bc_lib bc.h bc_lib_name 1 1 + +lib2.c: lib2.bc + cd ${BCDIR} && sh gen/strgen.sh gen/lib2.bc ${.OBJDIR}/lib2.c bc_lib2 bc.h bc_lib2_name 1 1 + +bc_help.c: bc_help.txt + cd ${BCDIR} && sh gen/strgen.sh gen/bc_help.txt ${.OBJDIR}/bc_help.c bc_help bc.h + +dc_help.c: dc_help.txt + cd ${BCDIR} && sh gen/strgen.sh gen/dc_help.txt ${.OBJDIR}/dc_help.c dc_help dc.h + +.include <bsd.prog.mk> |