git: 2c18dbaab4cc - 2023Q3 - security/R-cran-digest: fix build on armv7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 07 Aug 2023 13:08:00 UTC
The branch 2023Q3 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c18dbaab4ccf28597d15dfe7a57b194ed42fbef commit 2c18dbaab4ccf28597d15dfe7a57b194ed42fbef Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-08-07 13:05:07 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> 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.