From nobody Mon Aug 7 13:08:00 2023 X-Original-To: dev-commits-ports-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 4RKGp94Cxfz4pZ8K; Mon, 7 Aug 2023 13:08:01 +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 4RKGp916Cdz3dhf; Mon, 7 Aug 2023 13:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691413681; 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=uhBhAlPXl/RhD5Efel3FFcQdMKHz2M427ygAKvp0zFQ=; b=At6tnR+nxvZzJd4fg+vEyGhIrhoFfH2TGuZ8QabYCLrFVucuGYfI+cRERxHQW2O5xRUxhx yWcx2SK8CUK6iXx4xKUo5zBlVeRc4XhAVtxkpCKJBDBbtefSHFd9mDZH06ze3LIg1m1Ze8 blNtMChfST968Pek32ZsnsyKy1cKftW7qKs7XAsKUiFwRUY7f8VmVa3ZXbKgMJrnJPhgwZ vB4gJrI9MafJwDEda++GLzw/8mZpVS639lHWp9XO7I2ZG/ctw0yUNYmc5YvrQGxznQupZF KSDixZVTOH0ZPevp0l4OJFj/iaYAje6janSVEk7iVULivd4M0kWWU5NZyDx3RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691413681; 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=uhBhAlPXl/RhD5Efel3FFcQdMKHz2M427ygAKvp0zFQ=; b=GHkGv1wJ7usY6CT8dbIjssugSEB2vfVK2RvBy+icknxBnWvCrXU9goo4+c/0QYPAWlr0zw AXaylrpDrmEEG1WCGoL1AK7eLVcbaeDQ0g7IaLXaR24ivSJiLxpxvqPLgjTb+54DNQFneS 3Cz7pnD704Tex2CU5My0BuqCbOp27ZrrjKL+xLAn1hl/Kr2VArKSyVU8BYqJp802P3rNOu qRrQthob55X4Nlbaswgg6IdchlfATgYkEuOSLWuHzCjVHIyC7X5L7gO2j0Zz+hO8/z9SR0 diz9KUWKx+woGGavWKUSHhzs5QOPfoWUsXcUS4mfEygvTTia4/p+e0UhZGQEqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691413681; a=rsa-sha256; cv=none; b=BYY/w5bfG/xT7dU5idj6NlJVhdeniCtsJLAorHpCqD/U5tQjzuspNyoPj7fZmCYFFa0wXv M2yB8MTPY+3O/03mvUKWFn8toh/WdYrBJ11M/F30/cvelbaoRLEib/fDO72W0IOv52SISs VPQ5qZ0+YE5IogmZXl+Z46S1Dg8OJZ4cbXA8ccuoD98bV0g2KRL3Iq4KVuVWJZeFG+skUt wIUVfLr76wSt46UeowV3iJRIDkdJANfEdCAXMt5cK0tXJpZOSi1hnGmiNMP2eCKqs18kAd YHWCdtSOBgCPaOcK1l5Cs9d+MLG5xFnn8Z229AC1VjYcd4lSS0Ubl+bpnfF89A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKGp871jKzssp; Mon, 7 Aug 2023 13:08:00 +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 377D80aj093391; Mon, 7 Aug 2023 13:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377D80Qh093390; Mon, 7 Aug 2023 13:08:00 GMT (envelope-from git) Date: Mon, 7 Aug 2023 13:08:00 GMT Message-Id: <202308071308.377D80Qh093390@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 2c18dbaab4cc - 2023Q3 - security/R-cran-digest: fix build on armv7 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 2c18dbaab4ccf28597d15dfe7a57b194ed42fbef Auto-Submitted: auto-generated The branch 2023Q3 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c18dbaab4ccf28597d15dfe7a57b194ed42fbef commit 2c18dbaab4ccf28597d15dfe7a57b194ed42fbef Author: Robert Clausecker AuthorDate: 2023-08-07 13:05:07 +0000 Commit: Robert Clausecker CommitDate: 2023-08-07 13:05:07 +0000 security/R-cran-digest: fix build on armv7 Disable HAVE_MM_PREFETCH in the bundled crc32c as this option is available on x86 only. In any way, not using _mm_prefetch should not have a significant performance impact as an arch-agnostic prefetch method is used instead. Upstream made the same change in 0.6.33, which is what we ship in the main branch. Approved by: portmgr (build fix blanket) --- security/R-cran-digest/Makefile | 1 + .../R-cran-digest/files/patch-src_crc32c_crc32c__config.h | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/security/R-cran-digest/Makefile b/security/R-cran-digest/Makefile index 17e55a56b300..51f20099f269 100644 --- a/security/R-cran-digest/Makefile +++ b/security/R-cran-digest/Makefile @@ -1,5 +1,6 @@ PORTNAME= digest DISTVERSION= 0.6.32 +PORTREVISION= 1 CATEGORIES= security DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/security/R-cran-digest/files/patch-src_crc32c_crc32c__config.h b/security/R-cran-digest/files/patch-src_crc32c_crc32c__config.h new file mode 100644 index 000000000000..63233a1b51c0 --- /dev/null +++ b/security/R-cran-digest/files/patch-src_crc32c_crc32c__config.h @@ -0,0 +1,11 @@ +--- src/crc32c/crc32c_config.h.orig 2023-08-07 12:55:59 UTC ++++ src/crc32c/crc32c_config.h +@@ -12,7 +12,7 @@ + #define HAVE_BUILTIN_PREFETCH 1 + + // Define to 1 if targeting X86 and the compiler has the _mm_prefetch intrinsic. +-#define HAVE_MM_PREFETCH 1 ++#define HAVE_MM_PREFETCH 0 + + // Define to 1 if targeting X86 and the compiler has the _mm_crc32_u{8,32,64} + // intrinsics.