From nobody Tue May 24 13:39:54 2022 X-Original-To: dev-commits-ports-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 3DC831AEC283; Tue, 24 May 2022 13:39:55 +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 4L6wL314zqz4Wxp; Tue, 24 May 2022 13:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653399595; 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=5kAfvIgBFg6zFmaWpuOmLn7kz/8j5wlKL/XyaRuupAY=; b=MGNlKJPEZnEokBytm7pNQCHP91LK5/x47dLjFCCg7Dju48bzDlTqeRKxIRbs9LT/YXxffG eG6wxPmGyh4zKsmi2pz642xyd1gSNLp5ZdNOh0Z//bJHSl3PvJX7hbiKr9h1WF92/OiQVo D4SepGOhDksXy7pjvdsq2qt1fMhhMmCh5MDDw+KffSVv77J3x4rtxkk7/OXUIA+iaSc9QQ F3N+xYHhcYNOEDKIYprrGod+g+8UShjCa8zHEFk+aqX7Jd3BoGxPLYIVun5uGkbDJaJCQC 03oN2eYdXeGo72ZDNJQpJO49PhLDzlG04bPxc3idxGDGLukpPFbpihcm42OrSg== 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 0520725378; Tue, 24 May 2022 13:39:55 +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 24ODdsEU038475; Tue, 24 May 2022 13:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ODdsTv038474; Tue, 24 May 2022 13:39:54 GMT (envelope-from git) Date: Tue, 24 May 2022 13:39:54 GMT Message-Id: <202205241339.24ODdsTv038474@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 8bfcc7c9738a - main - benchmarks/lzbench: fix the port's build on ARM and RISC-V List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bfcc7c9738a835ba65030236d816c222cb5e8fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653399595; 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=5kAfvIgBFg6zFmaWpuOmLn7kz/8j5wlKL/XyaRuupAY=; b=UJja9Z9Gif9JmxtBS8R+qzgwJvtNi8VS8Tb++L/ov/Ek1q2vmEZs4r3tIn+l6Pz7vbr8+0 nnB+DM31gfEGFzgLWdm//y2Jlv+rAXGIzUGc1eiRyf/u4GNilyjVJPM52fzOCTp8/8zjaG 5ks3Ysh3etcK3jww2ohlDiJ70ctrxLj3qWJBgoiK6as+o43Vj2eRyEgmQ0TeC4Jaw5bSZU lqEkd/S99mPdzbxd7JRxJCmpQB5RDa4di/oaxt8SwfzVxXjNO3+vbuRO9q0jFmpUR6X8Dw RwWuArkDSVoZwfZ4v0FmHeErkTi5TBqPKzF1ZrA0aQjaEo23beUsoq7QUlxrOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653399595; a=rsa-sha256; cv=none; b=Iiu0mCBcvH3pAbhROP251v4dZzbPwCWzH63QjUtK+wt/PtZ4wY0uhlALiaWL0UGsZD3U1u ND9dPWArw0tE9w/AyOPPy+p6eXSSHLUsOzVJasLT1XVRIUwh54gTOxRJwIsSCQQx4h/Fg8 La+PqHBDlFW4g3NAWHXACsphv1i9znOsEqyJiFfMJKwTCCEDlxJ4/VojpgE8Cu3YHhhD02 qAlHrVWFg2YPtsxGIG31EFbUnH+nJ6Jrg3xxwoCaWnsNlfG3EXb3lEdVud4VTKoJ0S5BwB a+pa7XuMRxkrwN4G6iLtwcFcYOwusOLJCOtpX6Cn5W7CabtNqeN/l6dy6SoZbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8bfcc7c9738a835ba65030236d816c222cb5e8fc commit 8bfcc7c9738a835ba65030236d816c222cb5e8fc Author: Alexey Dokuchaev AuthorDate: 2022-05-24 13:39:30 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-05-24 13:39:30 +0000 benchmarks/lzbench: fix the port's build on ARM and RISC-V While here, mute the compiler when it is being called inside the GNU make's $(shell ...) context: these errors do not cause build failures (they are not propagated to the caller) but can confuse careless readers of the build log. PR: 260625 --- benchmarks/lzbench/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/benchmarks/lzbench/Makefile b/benchmarks/lzbench/Makefile index ead1d54a6f93..544f0d35a83f 100644 --- a/benchmarks/lzbench/Makefile +++ b/benchmarks/lzbench/Makefile @@ -8,8 +8,6 @@ CATEGORIES= benchmarks MAINTAINER= danfe@FreeBSD.org COMMENT= In-memory benchmark of open-source LZ77/LZSS/LZMA compressors -BROKEN_riscv64= fails to compile: invalid arch name 'native', string must begin with rv32{i,e,g} or rv64{i,g} - USES= compiler:c11 gmake USE_GITHUB= yes GH_ACCOUNT= inikep @@ -22,6 +20,12 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '/PROGOS/s,Linux,${OPSYS},' \ ${WRKSRC}/_lzbench/lzbench.h + @${REINPLACE_CMD} -e 's,shell echo|$$(CC),& 2>/dev/null,' \ + ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e '/pithy_Load64/s,vld1_u64(,&(uint64_t *),' \ + ${WRKSRC}/pithy/pithy.cpp + @${REINPLACE_CMD} -e '/^#if/s,defined(__aarch64__),& ||\ + __riscv_xlen == 64,' ${WRKSRC}/tornado/Common.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lzbench ${STAGEDIR}${PREFIX}/bin