commit: 6ef5874c1d823d27ab5a3dd70bf57acdff8ea066 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon May 26 01:42:07 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon May 26 01:42:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef5874c
dev-python/numpy: fix build w/ GCC 16 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-python/numpy/files/numpy-2.2.6-gcc16.patch | 14 ++++++++++++++ dev-python/numpy/numpy-2.2.6.ebuild | 3 +++ 2 files changed, 17 insertions(+) diff --git a/dev-python/numpy/files/numpy-2.2.6-gcc16.patch b/dev-python/numpy/files/numpy-2.2.6-gcc16.patch new file mode 100644 index 000000000000..a297551ded05 --- /dev/null +++ b/dev-python/numpy/files/numpy-2.2.6-gcc16.patch @@ -0,0 +1,14 @@ +https://github.com/google/highway/issues/2577 +https://github.com/google/highway/commit/7cde540171a1718a9bdfa8f896d70e47eb0785d5 +--- a/numpy/_core/src/highway/hwy/ops/set_macros-inl.h ++++ b/numpy/_core/src/highway/hwy/ops/set_macros-inl.h +@@ -141,7 +141,8 @@ + #define HWY_TARGET_STR_AVX2 \ + HWY_TARGET_STR_SSE4 ",avx,avx2" HWY_TARGET_STR_BMI2_FMA HWY_TARGET_STR_F16C + +-#if HWY_COMPILER_GCC_ACTUAL >= 1400 || HWY_COMPILER_CLANG >= 1800 ++#if (HWY_COMPILER_GCC_ACTUAL >= 1400 && HWY_COMPILER_GCC_ACTUAL < 1600) || \ ++ HWY_COMPILER_CLANG >= 1800 + #define HWY_TARGET_STR_AVX3_VL512 ",evex512" + #else + #define HWY_TARGET_STR_AVX3_VL512 diff --git a/dev-python/numpy/numpy-2.2.6.ebuild b/dev-python/numpy/numpy-2.2.6.ebuild index cee6d0e62cd6..ccd5e0511fb2 100644 --- a/dev-python/numpy/numpy-2.2.6.ebuild +++ b/dev-python/numpy/numpy-2.2.6.ebuild @@ -63,6 +63,9 @@ python_prepare_all() { # https://github.com/numpy/numpy/pull/28748 # https://github.com/numpy/numpy/pull/28928 "${FILESDIR}/${PN}-2.2.5-py314.patch" + # https://github.com/google/highway/issues/2577 + # github.com/google/highway/commit/7cde540171a1718a9bdfa8f896d70e47eb0785d5 + "${FILESDIR}/${PN}-2.2.6-gcc16.patch" ) # bug #922457
