From 93641a0ad9f042f1101efa99ea9bf2b74bb708a9 Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Wed, 6 Apr 2022 13:45:25 +0000
Subject: Adding metadata

---
 dev-cpp/glog/glog-0.5.0.ebuild                     |  2 +-
 ...6.0-fix-AVX512-detection-on-IceLakeClient.patch | 17 +++++++++
 dev-cpp/highway/highway-0.16.0-r1.ebuild           | 41 ++++++++++++++++++++++
 dev-cpp/highway/highway-0.16.0.ebuild              | 37 -------------------
 4 files changed, 59 insertions(+), 38 deletions(-)
 create mode 100644 dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch
 create mode 100644 dev-cpp/highway/highway-0.16.0-r1.ebuild
 delete mode 100644 dev-cpp/highway/highway-0.16.0.ebuild

(limited to 'dev-cpp')

diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index fe2ba7a63245..88123b2be536 100644
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch b/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch
new file mode 100644
index 000000000000..de157925c6ef
--- /dev/null
+++ b/dev-cpp/highway/files/highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch
@@ -0,0 +1,17 @@
+https://github.com/google/highway/commit/daf441c78191b3433410498d27a5bfdfdf93a142
+
+diff --git a/hwy/targets.cc b/hwy/targets.cc
+index 2a0ab4ef..7e7e2d79 100644
+--- a/hwy/targets.cc
++++ b/hwy/targets.cc
+@@ -328,8 +328,8 @@ uint32_t SupportedTargets() {
+     if (!IsBitSet(xcr0, 2)) {
+       bits &= ~uint32_t(HWY_AVX2 | HWY_AVX3 | HWY_AVX3_DL);
+     }
+-    // ZMM + opmask
+-    if ((xcr0 & 0x70) != 0x70) {
++    // opmask, ZMM lo/hi
++    if (!IsBitSet(xcr0, 5) || !IsBitSet(xcr0, 6) || !IsBitSet(xcr0, 7)) {
+       bits &= ~uint32_t(HWY_AVX3 | HWY_AVX3_DL);
+     }
+   }
diff --git a/dev-cpp/highway/highway-0.16.0-r1.ebuild b/dev-cpp/highway/highway-0.16.0-r1.ebuild
new file mode 100644
index 000000000000..52fb0b16d961
--- /dev/null
+++ b/dev-cpp/highway/highway-0.16.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-AVX512-detection-on-IceLakeClient.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DHWY_WARNINGS_ARE_ERRORS=OFF
+	)
+
+	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/highway/highway-0.16.0.ebuild b/dev-cpp/highway/highway-0.16.0.ebuild
deleted file mode 100644
index 89b07a85a587..000000000000
--- a/dev-cpp/highway/highway-0.16.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DHWY_WARNINGS_ARE_ERRORS=OFF
-	)
-
-	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
-
-	cmake_src_configure
-}
-- 
cgit v1.3.1