From nobody Thu Jan 18 17:48:17 2024 X-Original-To: dev-commits-src-branches@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 4TG9Ft1dBhz56bMy; Thu, 18 Jan 2024 17:48:18 +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 4TG9Fs6Qq2z49wx; Thu, 18 Jan 2024 17:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705600097; 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=X0h0HyOQIMFppHTX1V9oYAPBmEbzhtzLrIJm9oWeNGs=; b=wW5ysIE/lGzVh0cSBFnAAvByjGcgwoiH2l/s4VWJRZE3W/Qgw+m8AUfz0MrzeTYU0Amwi2 A2V/qmukIn50tUoK7MChPKn36Hr4AoV1fl/iCk9lebhS4B+7GoPmeQTkLgqT5p5D7yAY7o 7JCc+sfV9JnGtf8AwOTS0ap/74R+9yQlp/zOOD9LTqje59inQuCTjDyobHS1s5uc9R3bFR qbnFo1OwSTwxWWWf8C0og02fmVxBb+WdpHDHca5Ayrk/bRAhMNa4qcgbkLBAKxxcsqtrDe fCirqRSGkhgn0m30VLjwMM0Ihd64DDerMCwgk5oF1OOavAYJwEawFNYww5xB/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705600097; 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=X0h0HyOQIMFppHTX1V9oYAPBmEbzhtzLrIJm9oWeNGs=; b=nYWD9gac9fjYAvJnf2ToLKikjXIybZrpAYMXAaA+xFScl/bP+VR5Gkk+MRMoMRSq2T5eSK fZpcBqD3lqqMIAouv1R6ntp6CFSCa/maueXO5SzFQAFAnKHG3wXhX+U67QlM7mS4mOoCy3 KDdKv9obtaa1nXVbCtDb3BRQ93pleNid+l8HdWnFF51G1KsBEttTyyhF73+j9PYsTOOW2Z 4sLDJaHmo4TVRpQahEZw1AUadbdyEll1IuOtnQX9bskyTY17xYHiiDUsQlmsJtSTEK2JiP BwwlsBvXXzEXYiJRJyghys3MC7jAFlgpFG4/L16znNkUDMGDVu6qaMVI6/YLNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705600097; a=rsa-sha256; cv=none; b=mb34Lobp4NSMwBHaYiN9YFrv+onw4yx8ePO2WrCoRX6ta5+L29QsRGPFAl6l49MJGZJaQH 7z1+/LKBAzWW/JeQlFk+gPl3Msyotw+uEC+HCKDtLbWlNyKOkao224pZa4UUPeJzCMZ4Wq /Gt6IbD+FQAKUtfA58f1P+6p8/yZLif/728bsWgMb7lf+oslbtNbohWyR+fJyxYghgiH1+ diiaqGuKOUeMHnApyXRjcnT9uhlCKlVBx7EhvW+6lorxHwe5pt3pZAoVNChSt6wuj3Jt2J I03uVhB6hkl6kjSKuhRFwETot8xF/sepkA+L4Z8ScA4d1HOOn1LxFfDCGlGkDA== 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 4TG9Fs5QRgzGmV; Thu, 18 Jan 2024 17:48:17 +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 40IHmHRP014219; Thu, 18 Jan 2024 17:48:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IHmHIw014216; Thu, 18 Jan 2024 17:48:17 GMT (envelope-from git) Date: Thu, 18 Jan 2024 17:48:17 GMT Message-Id: <202401181748.40IHmHIw014216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: ece15876b8a8 - stable/13 - usr.bin/gh-bc: fix Makefile for WITHOUT_NLS_CATALOGS case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ece15876b8a86031afa7c1e37fdda341ad65089d Auto-Submitted: auto-generated The branch stable/13 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=ece15876b8a86031afa7c1e37fdda341ad65089d commit ece15876b8a86031afa7c1e37fdda341ad65089d Author: Stefan Eßer AuthorDate: 2023-07-29 18:52:53 +0000 Commit: Stefan Eßer CommitDate: 2024-01-18 17:47:06 +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 (cherry picked from commit 382af2f8d7bf576ff583543737e1134701ccc63d) --- usr.bin/gh-bc/Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile index c7fdc3c5a797..e78ab4b2994b 100644 --- a/usr.bin/gh-bc/Makefile +++ b/usr.bin/gh-bc/Makefile @@ -60,6 +60,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 @@ -69,15 +77,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:Mmips*} == "" && ${MACHINE_ARCH} != powerpc64 && \ - ${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