From nobody Tue Feb 25 15:13:21 2025 X-Original-To: dev-commits-ports-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 4Z2Lhf1b9Jz5q3TK; Tue, 25 Feb 2025 15:13:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z2Lhd70kpz3ZKJ; Tue, 25 Feb 2025 15:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740496402; 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=8twLPQy2sxsDLui2qZIDCN9ZEZjOvoqDMmnDphoRF1M=; b=VIRaNFH1RCaA+XbTz0BKKlL/BTYyMlbCVIbFFzgyWTxLxzALL986R0NvmsFpLRSt38AV8i DaqdHco60bMoSMvgJr1IF19EHT7ATmrwJHzWdOTcAm3CQfF69UWdv8sy4iasUiAh2owP7g 034x7rXoTpSxrZZGzUccNZ3XEHtuRt/h1m+DejiVl9hbZxTW+xX4xAJVqEdS8c6MCTo9Sb YV2v8OQcRCJjzxgaNdDgNP6dAj+ARkg0lI1otP8BN873dJ19S/ni3QPSrtlDddFXZnIqNZ RRjVafzw5qKnrpdhZygHkS7++Z7aQYoUMMjlHIdgDaevT+PJDr/nOo4oRwckuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740496402; a=rsa-sha256; cv=none; b=c5CScYljJIdBoGX3BoEwEnFtYf1wYMYVbS8yCcv9RSpEnorSG5e7F19zLoc/6X/p6W9fVd +zhNpCRjfA5uFcy6o3dSpo/1AqNBxX3umDC7mEnE6iZCa5HgX/AnWuSO+oDx331H1dKI66 eXGMKqRS3+EefPAfLtqr3s41cGx8mzqIKl8xKKMMkqxVlqM6PgOFbd7nMFDbyYTSt5OIuu K1FXkrTY3QbSv7Vucab8TFCtgmB5NHBExT1WRcYE+J9vLy8NziOoJYUnxBXaXoC9dYKEls 9qn3Kx+ZtjT8QLAvNBb7WNZnxK+gCDrT+gbbfYuQAamlDmLq9FSNChOBP3UjHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740496402; 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=8twLPQy2sxsDLui2qZIDCN9ZEZjOvoqDMmnDphoRF1M=; b=GlHVFzA+aKav7udWh0IJEQHyoQS0VMnztqRs8ThVk5vn6+DdOiK3hQMgPUdLfUmZ7b2xQn I2BFlxe0iwPhA3F9ZYB1koE5BoD+ASU3TNRHOd0tM4X61ibGSSH6ntc6l3UWTHBwamJ0Eh xir+7ar7CRWnOr+cegTCoP13wnO5rdt7beih2M6UQoynvoTkGtltFoC8DZx1qwu4De5aiV pQw0UT50+lV6wjLKJAFDcF1MrP3MR+tRnhm/PVxv5tZikIiG6NfgK/reaX8OiG5Oq0VORA QiPAq81D1CoNPizqx9/V9LaaT2QB1Tba2/gDFtUf/gP/wqZoCRAbIptTijREVQ== 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 4Z2Lhd6PB5zY1V; Tue, 25 Feb 2025 15:13:21 +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 51PFDLlK043679; Tue, 25 Feb 2025 15:13:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51PFDL4k043676; Tue, 25 Feb 2025 15:13:21 GMT (envelope-from git) Date: Tue, 25 Feb 2025 15:13:21 GMT Message-Id: <202502251513.51PFDL4k043676@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: cda8b6d4f465 - main - llvm-{cheri,morello}: Fix wrapper script List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cda8b6d4f4658bf4052330996e16d4ec27554787 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=cda8b6d4f4658bf4052330996e16d4ec27554787 commit cda8b6d4f4658bf4052330996e16d4ec27554787 Author: Brooks Davis AuthorDate: 2025-02-25 15:10:58 +0000 Commit: Brooks Davis CommitDate: 2025-02-25 15:10:58 +0000 llvm-{cheri,morello}: Fix wrapper script grep -q exits when it's found a match so if it exits fast enough, llvm-readelf might get a SIGPIPE which it failes to handle. Avoid this by using a redirect to /dev/null to silence grep instead of -q. Submitted by: def --- devel/llvm-cheri/Makefile | 2 +- devel/llvm-cheri/files/wrapper-cheri.sh.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 22aa8a1b0bc0..cb9c0f7ac35f 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel lang PKGNAMESUFFIX= ${LLVM_SUFFIX} diff --git a/devel/llvm-cheri/files/wrapper-cheri.sh.in b/devel/llvm-cheri/files/wrapper-cheri.sh.in index 46f5244c3c06..1ca26fcacf4d 100644 --- a/devel/llvm-cheri/files/wrapper-cheri.sh.in +++ b/devel/llvm-cheri/files/wrapper-cheri.sh.in @@ -147,7 +147,7 @@ arch_objdump_flags= if [ $CHERIBSD_VERSION -gt 0 ]; then case "$_TARGET" in aarch64-*-freebsd*) - if run_tool llvm-readelf -h ${_SYSROOT}/lib/libc.so.7 | grep -q "Flags:.*purecap"; then + if run_tool llvm-readelf -h ${_SYSROOT}/lib/libc.so.7 | grep "Flags:.*purecap" >/dev/null; then tls_flags= vararg_flags= if [ "$CHERIBSD_VERSION" -le 20220314 ]; then @@ -176,7 +176,7 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then fi ;; riscv64-*-freebsd*) - if run_tool llvm-readelf -h ${_SYSROOT}/lib/libc.so.7 | grep -q "Flags:.*cheriabi"; then + if run_tool llvm-readelf -h ${_SYSROOT}/lib/libc.so.7 | grep "Flags:.*cheriabi" >/dev/null; then mabi=l64pc128d else mabi=lp64d