git: fdd4c35832de - main - usr.bin/gh-bc: update Makefiles for version 6.2.2

The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/src/commit/?id=fdd4c35832deb1d064f64c2c00e3c8c958be9a51

commit fdd4c35832deb1d064f64c2c00e3c8c958be9a51
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2023-01-28 22:48:34 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2023-01-28 22:48:34 +0000

    usr.bin/gh-bc: update Makefiles for version 6.2.2
    
    The sources of this program are in contrib/bc, but built using the
    Makefiles touched in this commit, which had to be adapted to comply
    with changed made to the build system of this software, which is
    not used when building in the base system.
---
 usr.bin/gh-bc/Makefile       | 40 ++++++++++++++++++++++++----------------
 usr.bin/gh-bc/tests/Makefile |  4 ++--
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile
index bb44480b631c..77c5d8f1d270 100644
--- a/usr.bin/gh-bc/Makefile
+++ b/usr.bin/gh-bc/Makefile
@@ -33,26 +33,34 @@ 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+=	-DBUILD_TYPE=A
+CFLAGS=-g -O0
 CFLAGS+=	-DBC_DEFAULT_BANNER=0
+CFLAGS+=	-DBC_DEFAULT_DIGIT_CLAMP=0
+CFLAGS+=	-DBC_DEFAULT_EXPR_EXIT=1
 CFLAGS+=	-DBC_DEFAULT_PROMPT=0
-CFLAGS+=	-DBC_DEFAULT_SIGINT_RESET
-CFLAGS+=	-DBC_DEFAULT_TTY_MODE
-CFLAGS+=	-DBC_ENABLED
-CFLAGS+=	-DBC_ENABLE_EDITLINE
-CFLAGS+=	-DBC_ENABLE_EXTRA_MATH
+CFLAGS+=	-DBC_DEFAULT_SIGINT_RESET=1
+CFLAGS+=	-DBC_DEFAULT_TTY_MODE=1
+CFLAGS+=	-DBC_ENABLED=1
+CFLAGS+=	-DBC_ENABLE_AFL=0
+CFLAGS+=	-DBC_ENABLE_EDITLINE=1
+CFLAGS+=	-DBC_ENABLE_EXTRA_MATH=1
+CFLAGS+=	-DBC_ENABLE_HISTORY=1
 CFLAGS+=	-DBC_ENABLE_LIBRARY=0
-CFLAGS+=	-DBC_ENABLE_LONG_OPTIONS
-CFLAGS+=	-DBC_ENABLE_HISTORY
-CFLAGS+=	-DBC_ENABLE_PROMPT
-CFLAGS+=	-DBC_ENABLE_RAND
+CFLAGS+=	-DBC_ENABLE_MEMCHECK=0
+CFLAGS+=	-DBC_ENABLE_NLS=1
+CFLAGS+=	-DBC_EXCLUDE_EXTRA_MATH=0
+
+CFLAGS+=	-DDC_DEFAULT_DIGIT_CLAMP=0
+CFLAGS+=	-DDC_DEFAULT_EXPR_EXIT=1
 CFLAGS+=	-DDC_DEFAULT_PROMPT=0
-CFLAGS+=	-DDC_DEFAULT_SIGINT_RESET
+CFLAGS+=	-DDC_DEFAULT_SIGINT_RESET=1
 CFLAGS+=	-DDC_DEFAULT_TTY_MODE=0
-CFLAGS+=	-DDC_ENABLED
+CFLAGS+=	-DDC_ENABLED=1
+
+CFLAGS+=	-DBUILD_TYPE=A
+CFLAGS+=	-DMAINEXEC=${PROGNAME}
 CFLAGS+=	-DNDEBUG
+CFLAGS+=	-DNLSPATH=/usr/share/nls/%L/%N.cat
 CFLAGS+=	-I${BCDIR}/include
 
 .if ${MK_NLS_CATALOGS} == "no"
@@ -67,10 +75,10 @@ MAN_SRC_DC=	dc/A.1
 # prevent floating point incompatibilities caused by -flto on some architectures
 .if ${MACHINE_ARCH:Mmips*} == "" && ${MACHINE_ARCH} != powerpc64 && \
 	${MACHINE_ARCH} != riscv64
-CFLAGS+=	-flto
+#CFLAGS+=	-flto
 .endif
 
-HAS_TESTS=
+HAS_TESTS=	yes
 SUBDIR.${MK_TESTS}+= tests
 
 .for catalog in ${CATALOGS}
diff --git a/usr.bin/gh-bc/tests/Makefile b/usr.bin/gh-bc/tests/Makefile
index 338deb41c534..bdd00186137e 100644
--- a/usr.bin/gh-bc/tests/Makefile
+++ b/usr.bin/gh-bc/tests/Makefile
@@ -58,10 +58,10 @@ PLAIN_TESTS_SH=		bc_tests dc_tests
 
 bc_tests.sh:
 	echo "#!/bin/sh" > ${.TARGET}
-	echo "env LANG=C ${TESTSDIR}/tests/all.sh bc 1 1 0 0 bc" >> ${.TARGET}
+	echo "env LANG=C ${TESTSDIR}/tests/all.sh bc 1 1 0 0 0 bc" >> ${.TARGET}
 
 dc_tests.sh:
 	echo "#!/bin/sh" > ${.TARGET}
-	echo "env LANG=C ${TESTSDIR}/tests/all.sh dc 1 1 0 0 dc" >> ${.TARGET}
+	echo "env LANG=C ${TESTSDIR}/tests/all.sh dc 1 1 0 0 0 dc" >> ${.TARGET}
 
 .include <bsd.test.mk>