From nobody Sat Jan 28 22:50:49 2023 X-Original-To: dev-commits-src-all@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 4P48mn1rvsz3bD3k; Sat, 28 Jan 2023 22:50:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P48mn1PfTz3R4x; Sat, 28 Jan 2023 22:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674946249; 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=5kRrxMLM6TAjviKWCmZ6nDBqHliPgGVL3fEURYsD1ec=; b=l69MvWjUatVLlVakAuao2/7CZwAAzsJpkni8zuEqr9/nojCyRQJCEFd3Vdvdf6hmqefYnz N4+4/eqYhYuVITSGp4TC4+XzqzSizbBsIrRinplZoFml25U4uoY2AU1DzLWvUZD+ESKFMm 38zz9vn9vuve5c9YeUUUWIfxY7qe41txZREyy4R1xyoYpjjGNo4tKrYmr61xqr7/y6enIf dD2Mq+yk5/UewthzP8g/ND8OoEyaF3dpSngN9gDKK634EWmqWevbQv+ki36Gk27c72nOjh aATUobwrFxURKPbJtPOWLCScJzsR6wWH97Cls/1MQnJd86UAwmN5fVrFm4vvAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674946249; 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=5kRrxMLM6TAjviKWCmZ6nDBqHliPgGVL3fEURYsD1ec=; b=xwU1Xsa1/cXY7OythfKqzmvClzvPdeYZuJwcXO6G0tRnm18yfOjzORpdNtiF7r5dWhqW8O deUXOsaoOU+090V0bVr+auG09j+pm6i9JI7ZH9Fm8MfA9nwxmqtN7izCGstGf7Wg4wa/SY XXv8JuK3eJhA2I1jtp2WZAlkEd0/pO0IXMkIjqOEmV4Xc4TZKFch83/tO+ll4nLGK1B4yc 06S0En5HgQGrM0bIDoOZO/JS8v0l7iZzNBKj2PG82wNfQnaQCDu/PkVFbfXsuKz2u075Ui IT4lNs5HMp4n4IhkU8+s5Amwp+XH5vn8mo/fpF0GuYaABv0xYII7ZgEwk8Tofw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674946249; a=rsa-sha256; cv=none; b=F6RkLwC4JvklpzkKVnQDQ4HmBbFDHyL+mKbka9g8CfxxxoRIL908Du7VIkjBKz4RD81Qnt DZgvtRxXg5HoKA7HdY+SficZZpA088UHx1Uv5NHBTAMnIkfm11LnrkHQogcmkihg9lcpD6 lDihdeTyMC4NdqWAPl24lr7m8v0xD4UoqfiiHVWdFJHoX3n+sBbQOZya7/IATWDpoaDXnU pEZt4pWnHrwUAmLnFoMwirPs+5chs0U7/TKhM/6XFwf/5hpx9qayhG0a9v7i08B4frRJlM ykYGPSRCaq2wTPgKuRCYzwCln2E34hhSy46uC2UX4KNwnL6d/Ag52Ni8tYMDHw== 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 4P48mn0SdRz15Vv; Sat, 28 Jan 2023 22:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30SMonHh075058; Sat, 28 Jan 2023 22:50:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30SMon4s075057; Sat, 28 Jan 2023 22:50:49 GMT (envelope-from git) Date: Sat, 28 Jan 2023 22:50:49 GMT Message-Id: <202301282250.30SMon4s075057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: fdd4c35832de - main - usr.bin/gh-bc: update Makefiles for version 6.2.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: fdd4c35832deb1d064f64c2c00e3c8c958be9a51 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=fdd4c35832deb1d064f64c2c00e3c8c958be9a51 commit fdd4c35832deb1d064f64c2c00e3c8c958be9a51 Author: Stefan Eßer AuthorDate: 2023-01-28 22:48:34 +0000 Commit: Stefan Eßer 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