6 files changed, 51 insertions, 7 deletions
diff --git a/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild b/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild
index c53780c9b1f9..203196b92ee9 100644
--- a/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild
+++ b/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild
@@ -13,7 +13,7 @@ EAPI=8
 # dev-cpp/wangle
 # dev-util/watchman
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Shared library for Watchman and Eden projects"
 HOMEPAGE="https://github.com/facebookexperimental/edencommon"
@@ -47,3 +47,15 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+	CMAKE_SKIP_TESTS=()
+
+	# This test fails on GCC 13.
+	# https://github.com/facebookexperimental/edencommon/issues/22
+	if tc-is-gcc && ver_test $(gcc-version) -lt 14.0.0; then
+		CMAKE_SKIP_TESTS+=(PathFuncs.move_or_copy)
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/folly/folly-2024.11.04.00.ebuild b/dev-cpp/folly/folly-2024.11.04.00-r1.ebuild
index 27be95cd3414..8406398d114d 100644
--- a/dev-cpp/folly/folly-2024.11.04.00.ebuild
+++ b/dev-cpp/folly/folly-2024.11.04.00-r1.ebuild
@@ -13,7 +13,7 @@ EAPI=8
 # dev-cpp/wangle
 # dev-util/watchman
 
-inherit cmake
+inherit flag-o-matic cmake
 
 DESCRIPTION="An open-source C++ library developed and used at Facebook"
 HOMEPAGE="https://github.com/facebook/folly"
@@ -75,6 +75,9 @@ src_configure() {
 		-DCMAKE_LIBRARY_ARCHITECTURE=$(usex amd64 x86_64 ${ARCH})
 	)
 
+	# https://github.com/facebook/folly/issues/1984
+	use arm64 && append-cxxflags "-flax-vector-conversions"
+
 	cmake_src_configure
 }
 
@@ -87,5 +90,15 @@ src_test() {
 		'concurrency_concurrent_hash_map_test.*'
 	)
 
+	if use arm64; then
+		CMAKE_SKIP_TESTS+=(
+			# Tests are flaky/timing dependent on both QEMU chroot and real hardware
+			io_async_hh_wheel_timer_test.HHWheelTimerTest
+			# Times out on real hardware
+			concurrent_skip_list_test.ConcurrentSkipList
+			futures_retrying_test.RetryingTest.largeRetries
+		)
+	fi
+
 	cmake_src_test
 }
diff --git a/dev-cpp/mvfst/mvfst-2024.11.04.00.ebuild b/dev-cpp/mvfst/mvfst-2024.11.04.00-r1.ebuild
index b920ce229a20..396d42d484be 100644
--- a/dev-cpp/mvfst/mvfst-2024.11.04.00.ebuild
+++ b/dev-cpp/mvfst/mvfst-2024.11.04.00-r1.ebuild
@@ -40,10 +40,23 @@ DEPEND="
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}"
-		-DLIB_INSTALL_DIR="$(get_libdir)"
+		-DCMAKE_INSTALL_MODULE_DIR="$(get_libdir)/cmake/${PN}"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
 		-DBUILD_TESTS="$(usex test ON OFF)"
 	)
 
 	cmake_src_configure
 }
+
+src_test() {
+	if use arm64; then
+		# These tests segfault on arm64.
+		# https://github.com/facebook/mvfst/issues/363
+		CMAKE_SKIP_TESTS=(
+			QuicClientTransportIntegrationTest.ResetClient
+			QuicClientTransportIntegrationTest.TestStatelessResetToken
+		)
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
index e9c1e4431fb6..4101cac09957 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ S="${WORKDIR}/json-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild
index 4b0c78687b79..91251a33990d 100644
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/scitokens/scitokens-cpp"
 else
 	SRC_URI="https://github.com/scitokens/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="C++ implementation of the SciTokens library with a C library interface"
diff --git a/dev-cpp/wangle/wangle-2024.11.04.00.ebuild b/dev-cpp/wangle/wangle-2024.11.04.00.ebuild
index 15b6be4d72de..fbe0818c12d4 100644
--- a/dev-cpp/wangle/wangle-2024.11.04.00.ebuild
+++ b/dev-cpp/wangle/wangle-2024.11.04.00.ebuild
@@ -58,5 +58,11 @@ src_test() {
 		SSLContextManagerTest
 	)
 
+	if use arm64; then
+		# This test fails on arm64.
+		# https://github.com/facebook/wangle/issues/241
+		CMAKE_SKIP_TESTS+=(TLSInMemoryTicketProcessorTest)
+	fi
+
 	cmake_src_test
 }