From nobody Thu Sep 11 14:44:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cN0h92Sc3z66lWD; Thu, 11 Sep 2025 14:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cN0h85tHJz3t5m; Thu, 11 Sep 2025 14:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757601880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Iic2qj1MRSXDAPaQHRwe5VAHDC+n5LFwze4uCtPFJ8=; b=OA8G1JeB01/Xtr0ZZw0408tYRS6E7lYZM7XwOpF6CSRl1bPq4tSTsGfqUex4+k0UNnmX+q KvuMi8D4zFnyvQxc2OH+KC/JHpBArf/KlDTeSbBQ+H/LU6pSU2fp7Y1CrXaCNyDxMGhYIO 0iczF4YQwO9jn8ykeY8qIcV5ff/Kp7oJ8w7tcARrfDk2WaPieKmhw+10+aycQ8X4XcnEaV n53aGdj5bhrqs+XZdLljXiejViMPAjr+1RBm3Vd8C15WJb58XzJ8kB+m9q878z4rRnAvmR aRp61T0dr3kylihcaNn2T+woMFgLv7fyhia7Gjlcj5giPx+WG/qtuXEZ243bOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757601880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Iic2qj1MRSXDAPaQHRwe5VAHDC+n5LFwze4uCtPFJ8=; b=xo+WjuiyFU/7k+nJQbyzC9nKVEeOoK+vlgZrAnDyxws3NqRdceK1ydkuDRtfA2QaInDVhu w9icHJ+8J/+AfLWuiuL9mz3P49oI6xSJsQ/gvEVhN3xANGVXLkhOXsSin5/Kd3aFqKI+EN aHvFHrCInLJDYWdxO2LP4n1TPea3g5eftuUCoCKrRYoFD1GvnPdPbQ+mt32wBq3094Pih8 Jb0UaGuKh6mXiXRmvGIFRHFoEsUv9CCeXH2hgR8ARfTdp58IMHGYMwFS8oNsm6cbBPdNJ7 vJwcZaQqcPB+YH0RK/SnwmeyWrAKBO/yLPEawUJHU1h6vUKjBkMVV+EbYaenCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757601880; a=rsa-sha256; cv=none; b=g3dwNPDEgwSBluMlleusdftg6BS4jF5ew4TI/4YPZeIRibhZCMzLCsuuONY/ruopphoRZk s7mdJbCtqMmw5RMw/3sAwTByfdG5gFV2KokTSUWJ9KatDywVEdrrOHx+faBaWX763O5UXn ZO2A3BwLSsqmUY/k1o3zq4hJQClA4OJuOfTray8HMAdZYa89HA3XG4qJcQb5CiERSy+d7s 9uObaxiKvPUXGZJ1mkTAU7W5b63MLjhlbPvqdiVT3IMgSVXjYeIpNb9xQwkCZt7kLT5R1y 9/DuX3Kk7xMYlEIsUk8TGErWkf+QYdllUjiNeXejQZwX4bmAqQiOuEJDzwAu0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cN0h85593z19yg; Thu, 11 Sep 2025 14:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58BEiemo030770; Thu, 11 Sep 2025 14:44:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58BEiePf030767; Thu, 11 Sep 2025 14:44:40 GMT (envelope-from git) Date: Thu, 11 Sep 2025 14:44:40 GMT Message-Id: <202509111444.58BEiePf030767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 2d06844521ec - main - usr.bin/gh-bc: update for version 7.1.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d06844521ecd9e1298b53f13c18ffbfa97b1e28 Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=2d06844521ecd9e1298b53f13c18ffbfa97b1e28 commit 2d06844521ecd9e1298b53f13c18ffbfa97b1e28 Author: Stefan Eßer AuthorDate: 2025-09-11 14:42:42 +0000 Commit: Stefan Eßer CommitDate: 2025-09-11 14:42:42 +0000 usr.bin/gh-bc: update for version 7.1.0 Add extra defines required for bc-7.1.0 to the Makefiles. --- usr.bin/gh-bc/Makefile | 6 +++++- usr.bin/gh-bc/tests/Makefile | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile index 0fdc687c0e50..9aa5116f6faa 100644 --- a/usr.bin/gh-bc/Makefile +++ b/usr.bin/gh-bc/Makefile @@ -4,6 +4,7 @@ PROG= gh-bc PROGNAME= bc BCDIR= ${SRCTOP}/contrib/${PROGNAME} +VERSION!= cat ${SRCTOP}/contrib/${PROGNAME}/VERSION.txt SRCS= args.c bc.c bc_lex.c bc_parse.c data.c dc.c dc_lex.c dc_parse.c file.c history.c SRCS+= lang.c lex.c main.c num.c opt.c parse.c program.c rand.c read.c vector.c vm.c @@ -31,6 +32,8 @@ CATALOGS+= zh_CN.UTF-8 zh_CN.eucCN zh_CN.GB18030 zh_CN.GB2312 zh_CN.GBK NLSNAME= bc NLSSRCDIR= ${BCDIR}/locales +CFLAGS+= -I${BCDIR}/include + CFLAGS+= -DBC_DEFAULT_BANNER=0 CFLAGS+= -DBC_DEFAULT_DIGIT_CLAMP=0 CFLAGS+= -DBC_DEFAULT_EXPR_EXIT=1 @@ -57,7 +60,8 @@ CFLAGS+= -DBUILD_TYPE=A CFLAGS+= -DMAINEXEC=${PROGNAME} CFLAGS+= -DNDEBUG CFLAGS+= -DNLSPATH=/usr/share/nls/%L/%N.cat -CFLAGS+= -I${BCDIR}/include + +CFLAGS+= -DVERSION=${VERSION} # prevent floating point incompatibilities caused by -flto on some architectures .if ${MACHINE_ARCH} != riscv64 diff --git a/usr.bin/gh-bc/tests/Makefile b/usr.bin/gh-bc/tests/Makefile index f3ef5a695e7d..f2c92aecb0a5 100644 --- a/usr.bin/gh-bc/tests/Makefile +++ b/usr.bin/gh-bc/tests/Makefile @@ -17,7 +17,8 @@ FILESfMODE= 0755 FILESGROUPS+= FILEStests FILEStestsPACKAGE= ${PACKAGE} FILEStestsDIR= ${TESTSDIR}/tests -FILEStests!= echo ${TEST_DIR}/tests/*.py ${TEST_DIR}/tests/*.sh ${TEST_DIR}/tests/*.txt +FILEStests!= echo ${TEST_DIR}/tests/*.py ${TEST_DIR}/tests/*.sed \ + ${TEST_DIR}/tests/*.sh ${TEST_DIR}/tests/*.txt FILEStestsMODE= 0755 FILESGROUPS+= FILESbc @@ -56,10 +57,12 @@ 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 BC_TEST_OUTPUT_DIR=$$(pwd) \ + ${TESTSDIR}/tests/all.sh -n bc 1 1 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 BC_TEST_OUTPUT_DIR=\$pwd \ + ${TESTSDIR}/tests/all.sh -n dc 1 1 0 0 dc" >> ${.TARGET} .include