gentoo auto-resync : 15:03:2023 - 12:21:13

4 files changed, 73 insertions, 0 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 5632a0df4b21..78cddd4edee2 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index d363c5fe8d7b..2bb1c11c6e10 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,7 +1,9 @@
 AUX 0001-fix-compile-for-armv7-targets-with-vfp4-and-lower.patch 5987 BLAKE2B e6168befa010bbfe2cce3633c78c8d8c5005ecbe605a12c39e1004284f80d580c0c8a9a037638e414e57a989f63370b54a64db2de1c25a3188d0a3df4611687b SHA512 03f5d89ed1038f6eab451c11216ac75bfa7165a57b1f46a0b6fedb03620a355b30bd868d0da371e44d1ebe5f625e4e36777929de63762953e4e9fc0013c6f5bb
+AUX 0002-fix-armv7-neon-detect-via-asm-hwcap.patch 913 BLAKE2B 6df3006c89b136a8df8db949ce2822b22780f1cd3aede7d468579ad179c0777464f467e6cf9000bf69e22f8ce9171c61ff1deeddb0646da4bebeca41a3f5d434 SHA512 5e71829b47eb75239e90189b2ce74efcdb055d6445f0b7d58610ea775969f8b223f1fdcc3b215259fa89d1f6b1ac0de0f184786db57235a429da37ddfbdaf519
 DIST highway-1.0.1.tar.gz 1730746 BLAKE2B 1c6185af91afe32fbb35285d49101d381ade7ded262cbcd3b0a8bf28b1924a76ac5a11423a1613068f3435fbbdd2ab0119aa8a1aafe2c3467e0aff1987f40aad SHA512 35b6287579b6248966b0d36fda1522fd6338523934b079e94e857f9de08354f20b99739c99d53249a3a6c583519da0e0ac5e06dfbe6e3a89262f627c75b59dd8
 DIST highway-1.0.3.tar.gz 1770704 BLAKE2B 5454f7e661270f25d1439a2a3d649a0f9970d7e10e0cfe6818c470b00460cc77b044ca83e912c91a3582b4a60af5d8d0f7c0aba01762acd3c98b9692fa0b20c6 SHA512 fc419c862e1686b6278081e8e10da41dc2bdfbd386a29b59e21a57375a47d3eeb5c7297e3078c78007b212121d936640b192a26a16c941e73cf599f24e081021
 EBUILD highway-1.0.1-r1.ebuild 1000 BLAKE2B 785d94ce1c5bda32873bae32c693eeb56672a1ae639dffbf8b6d609eb093f89adfb8ba262e7059bc64af8126ef80b6f80156ebd8386447377bfdca9023ed2a8c SHA512 3cfded30d2f7342f019bad820581629ae34edc1585f7e9442a164bfa122bcaa3f6a24d61d433c36f2bd199f1344efa1afbde3f7218b3d1ff0313c76b01c25136
+EBUILD highway-1.0.3-r1.ebuild 1081 BLAKE2B 557292f68411b450f3e013894922d85ac84f7188c1a859ed2104e46e85dec8ea116d2f2d1956ff529f5231efcedb369b537571003111f007d1aada9a6071053f SHA512 eef4d0ce932dc557a49c9c3dd44b28cadebb9d4882777c2bab76b0fd5bcbfc8f77552f4c65e56e90ac09c79a74285d217e89d99e64e840d5a4f7cbe0d98e5a08
 EBUILD highway-1.0.3.ebuild 1019 BLAKE2B 61447444b75bc7fdb09363992aeee6d454400f6d22288f972c0b48d18bf4eedb791bd1a5761ed7edc24f7f846926f3f34b290bec2c74abcb201d1e01282f4b4a SHA512 745b3be032f06e186791a758ca0d399327d9c4ee8b18c9e0ca87ebc862aee170aec0dd051a35502615b2df09894a66bfa9176ef4c4678410af00594121cd1e68
 EBUILD highway-9999.ebuild 918 BLAKE2B f6de6a0483355dfbc793c0fb1520cf8ca5eae7fceba7bff77c38979c18c0a82a07ea8505e972a62e7cbf0ae5abd39050f021524bc8c5680eef3b57ac3531a8d5 SHA512 a6ca4d498ff57290c34333c5553f9d80383f770103fd128cd5822046183d769deb4407f891918d0058152634bab09fa0dcd53f152ef9e8182a5cd3fd4aaa1ebe
 MISC metadata.xml 700 BLAKE2B 23fb803289745f094f19cb7dc6b296f56a3bf712b39f87ee563872496edb5798fe9f36ec1d8a9d9af52d26b589bca354bc58a3c039753156e09a154de27cb960 SHA512 b47da71c110bb91b523dd970a1ed8f4d40c1cc067c170d10ef0ad412850967682303e610c352d7c6425d7bad33d58f90a6d3a34a333a38e427c65a8341c3ec21
diff --git a/dev-cpp/highway/files/0002-fix-armv7-neon-detect-via-asm-hwcap.patch b/dev-cpp/highway/files/0002-fix-armv7-neon-detect-via-asm-hwcap.patch
new file mode 100644
index 000000000000..298b5a82f1c2
--- /dev/null
+++ b/dev-cpp/highway/files/0002-fix-armv7-neon-detect-via-asm-hwcap.patch
@@ -0,0 +1,29 @@
+https://github.com/google/highway/commit/f3a33e8204b69f9e21b5fbd8036c11128cec0d2e.patch
+https://github.com/google/highway/issues/1199
+
+https://bugs.gentoo.org/900352
+
+From f3a33e8204b69f9e21b5fbd8036c11128cec0d2e Mon Sep 17 00:00:00 2001
+From: Jan Wassenberg <janwas@google.com>
+Date: Tue, 7 Mar 2023 22:59:17 -0800
+Subject: [PATCH] fix arm7 NEON detect, thanks @stefson. Fixes #1199
+
+PiperOrigin-RevId: 514940076
+---
+ hwy/targets.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hwy/targets.cc b/hwy/targets.cc
+index dc4217c..24fcaf7 100644
+--- a/hwy/targets.cc
++++ b/hwy/targets.cc
+@@ -43,6 +43,9 @@
+ #endif  // HWY_COMPILER_MSVC
+ 
+ #elif HWY_ARCH_ARM && HWY_OS_LINUX && !defined(TOOLCHAIN_MISS_SYS_AUXV_H)
++// sys/auxv.h does not always include asm/hwcap.h, or define HWCAP*, hence we
++// still include this directly. See #1199.
++#include <asm/hwcap.h>
+ #include <sys/auxv.h>
+ #endif  // HWY_ARCH_*
+ 
diff --git a/dev-cpp/highway/highway-1.0.3-r1.ebuild b/dev-cpp/highway/highway-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..df7a93a56cf5
--- /dev/null
+++ b/dev-cpp/highway/highway-1.0.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
+HOMEPAGE="https://github.com/google/highway"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/highway.git"
+else
+	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cpu_flags_arm_neon test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/0001-fix-compile-for-armv7-targets-with-vfp4-and-lower.patch
+	"${FILESDIR}"/0002-fix-armv7-neon-detect-via-asm-hwcap.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DHWY_CMAKE_ARM7=$(usex cpu_flags_arm_neon)
+		-DBUILD_TESTING=$(usex test)
+		-DHWY_WARNINGS_ARE_ERRORS=OFF
+	)
+
+	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+	cmake_src_configure
+}