From nobody Sat Jul 29 19:01:04 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 4RCv3j1pf5z4pqkD; Sat, 29 Jul 2023 19:01:05 +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 4RCv3j1Nm7z3Jnx; Sat, 29 Jul 2023 19:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690657265; 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=bzbob1fp5gZseU0WUMX5Op2BGJ5LjRaRsoVPkRE/f3U=; b=wLCUdKyU5o7zzOgbDBbVwGh9IoOmjsIJDOYzh4KmG9g7wUKNzNiSdMAcwwjvbpSWeyZMQW KIcoYkDEJ40FmoP+gIuyl+16M8HKxdAgKo+zbuTjxn9vj5Fd1plVpSo+K880HNwG1uQ/Mt v6KayBDm+UMm3Ykt5WYJEHFtZQ8iPaAqkW9B17/YrZcKY5p03+lQlmrP2rWGzw2dRCEg4S UO1MBnIgYlsr5PFRvtK14bjiCBkpIDo41lB0t0b6EpsHEzv51R3YxGmXOoRg+VQ40bw3pv GVLZI+458hEMk3i/6fc2qtPJP2dKyLs1KimZmbwNjc52I1aySPxOGo4pWKiUkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690657265; 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=bzbob1fp5gZseU0WUMX5Op2BGJ5LjRaRsoVPkRE/f3U=; b=psvRSeiTz+aOw5AO2AT1Bm/FaJucQStmQ6r0qtWvQuuab3ELKxk0cGfhhIoX4Em/FmSi/u iQIEhVabpv/9PCUAdvcsjgurDMuKNaAu/0ph0Frh1tAurg9flZNXwfFJBqHxaY32z3qsR2 siSyRfU7aw5RITLGscbT8P6WFgpM++JUk0c1ZUpNvqf2CPrlD7xYcCszifCRuMYkY4eOcb 4s4dqYxlFuIsA0+yDoRTV7mLm9JS90AE+pIokL9s5uW4/TgJMkI2mFu7eeSx+KwuI7uFY1 hrOWEbiyhyukBAU+VgmBevT4vX6++YZN/dm9zt/HAZCyJDGkWHZPbtsh7itAPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690657265; a=rsa-sha256; cv=none; b=re7bpPXtOQBIG17FHTKZj0STK/lC6xYXyunFb3RmLASMbCvPS7za3RtEyuH119U5xynta8 Q6UPKjCl8IxI/nj2eB8rII51VSu3bM8ynleOHptg4eCb0J4KOogMd0MzhUS9606H80g5+u WVfRlckPK5g5kHHLmRhkSAmIId2Iq5vf/jpTxiz3MCa0wXcswY+QdqBYE6BuyC3Eqpevm0 a8pbx9dqxw+1RTXQwZWXM27mkTJ9qBoNziZzrTQ4IUgbtBLyUyNI5tpBH9ZCHcjgO2anlA AmjVSvZdU3685kYkG4engM+Q86xcvn4I0CO0nkyXRB1T3EnsXMFYZ8Wym5zFzg== 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 4RCv3j0Slwzklm; Sat, 29 Jul 2023 19:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36TJ14C3037458; Sat, 29 Jul 2023 19:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36TJ14M9037457; Sat, 29 Jul 2023 19:01:04 GMT (envelope-from git) Date: Sat, 29 Jul 2023 19:01:04 GMT Message-Id: <202307291901.36TJ14M9037457@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: 382af2f8d7bf - main - usr.bin/gh-bc: fix Makefile for WITHOUT_NLS_CATALOGS case 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: 382af2f8d7bf576ff583543737e1134701ccc63d Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=382af2f8d7bf576ff583543737e1134701ccc63d commit 382af2f8d7bf576ff583543737e1134701ccc63d Author: Stefan Eßer AuthorDate: 2023-07-29 18:52:53 +0000 Commit: Stefan Eßer CommitDate: 2023-07-29 18:57:32 +0000 usr.bin/gh-bc: fix Makefile for WITHOUT_NLS_CATALOGS case Some macro definitions had been moved into a Makefile section that depends on MK_NLS_CATALOGS != "no", leading to LTO and the installation of tests being disabled in the WITHOUT_NLS_CATALOGS case. Reported by: Yuri --- usr.bin/gh-bc/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile index 6554d626af89..8e5e90715ff0 100644 --- a/usr.bin/gh-bc/Makefile +++ b/usr.bin/gh-bc/Makefile @@ -61,6 +61,14 @@ CFLAGS+= -DNDEBUG CFLAGS+= -DNLSPATH=/usr/share/nls/%L/%N.cat CFLAGS+= -I${BCDIR}/include +# prevent floating point incompatibilities caused by -flto on some architectures +.if ${MACHINE_ARCH} != riscv64 +CFLAGS+= -flto +.endif + +HAS_TESTS= yes +SUBDIR.${MK_TESTS}+= tests + .if ${MK_NLS_CATALOGS} == "no" CFLAGS+= -DBC_ENABLE_NLS=0 MAN_SRC_BC= bc/N.1 @@ -70,14 +78,6 @@ CFLAGS+= -DBC_ENABLE_NLS=1 MAN_SRC_BC= bc/A.1 MAN_SRC_DC= dc/A.1 -# prevent floating point incompatibilities caused by -flto on some architectures -.if ${MACHINE_ARCH} != riscv64 -CFLAGS+= -flto -.endif - -HAS_TESTS= yes -SUBDIR.${MK_TESTS}+= tests - .for catalog in ${CATALOGS} NLS+= ${catalog:C/.*://} NLSSRCFILES_${catalog:C/.*://}= ${catalog:C/.*://}.msg