commit: ab2669fe160f3ecc0a8f64f0eb3a08e149699bd1
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 5 17:40:30 2025 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Aug 5 19:53:32 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab2669fe
sci-libs/ginkgo: fix missing dep by not building examples
examples are not installed, but add ~50 new C++ build targets. In
1.10.0, they also add a DEPEND on nlohmann_json, which then fails by
falling back to git cloning it if a system copy is not found.
```
CMake Error at /usr/share/cmake/Modules/FetchContent.cmake:1918 (message):
Build step for nlohmann_json failed: 1
Call Stack (most recent call first):
/usr/share/cmake/Modules/FetchContent.cmake:1609
(__FetchContent_populateSubbuild)
/usr/share/cmake/Modules/FetchContent.cmake:2145:EVAL:2
(__FetchContent_doPopulation)
/usr/share/cmake/Modules/FetchContent.cmake:2145 (cmake_language)
/usr/share/cmake/Modules/FetchContent.cmake:2384 (__FetchContent_Populate)
third_party/nlohmann_json/CMakeLists.txt:10 (FetchContent_MakeAvailable)
-- Configuring incomplete, errors occurred!
* ERROR: sci-libs/ginkgo-1.10.0::gentoo failed (configure phase):
```
But we wouldn't need this at all, if we refrained from building examples
we don't use, not even for tests which are already disabled.
Fixes: 64fb6d4f52ca6c0d086289743b74f3a1183e538d
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
...kgo-1.10.0-disable_automagic_dependencies.patch | 24 ----------------------
...nkgo-1.6.0-disable_automagic_dependencies.patch | 24 ----------------------
...nkgo-1.8.0-disable_automagic_dependencies.patch | 24 ----------------------
sci-libs/ginkgo/ginkgo-1.10.0.ebuild | 5 +----
sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild | 3 ++-
sci-libs/ginkgo/ginkgo-1.6.0.ebuild | 4 ++--
sci-libs/ginkgo/ginkgo-1.8.0.ebuild | 7 ++-----
7 files changed, 7 insertions(+), 84 deletions(-)
diff --git
a/sci-libs/ginkgo/files/ginkgo-1.10.0-disable_automagic_dependencies.patch
b/sci-libs/ginkgo/files/ginkgo-1.10.0-disable_automagic_dependencies.patch
deleted file mode 100644
index 9614e2aeb4d6..000000000000
--- a/sci-libs/ginkgo/files/ginkgo-1.10.0-disable_automagic_dependencies.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 8f4c848..cf2b69b 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -48,8 +48,7 @@ if(GINKGO_BUILD_EXTLIB_EXAMPLE)
- list(APPEND EXAMPLES_LIST external-lib-interfacing)
- endif()
-
--find_package(OpenCV QUIET)
--if(OpenCV_FOUND)
-+if(FALSE)
- list(APPEND EXAMPLES_LIST heat-equation schroedinger-splitting)
- else()
- message(STATUS "No OpenCV found, disabling examples with video output")
-@@ -68,8 +67,7 @@ if(GINKGO_BUILD_MPI)
- )
- endif()
-
--find_package(Kokkos 4.1.00 QUIET)
--if(Kokkos_FOUND)
-+if(FALSE)
- list(APPEND EXAMPLES_LIST kokkos-assembly)
- else()
- message(STATUS "No Kokkos found, disabling examples with Kokkos
assembly.")
diff --git
a/sci-libs/ginkgo/files/ginkgo-1.6.0-disable_automagic_dependencies.patch
b/sci-libs/ginkgo/files/ginkgo-1.6.0-disable_automagic_dependencies.patch
deleted file mode 100644
index c910ad92c5a9..000000000000
--- a/sci-libs/ginkgo/files/ginkgo-1.6.0-disable_automagic_dependencies.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 41ed77d900..9a0c7d5128 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -40,8 +40,7 @@ if(GINKGO_BUILD_EXTLIB_EXAMPLE)
- list(APPEND EXAMPLES_LIST external-lib-interfacing)
- endif()
-
--find_package(OpenCV QUIET)
--if(OpenCV_FOUND)
-+if(FALSE)
- list(APPEND EXAMPLES_LIST heat-equation schroedinger-splitting)
- else()
- message(STATUS "No OpenCV found, disabling examples with video output")
-@@ -55,8 +54,7 @@ if(GINKGO_BUILD_MPI)
- list(APPEND EXAMPLES_LIST distributed-solver)
- endif()
-
--find_package(Kokkos QUIET)
--if(Kokkos_FOUND)
-+if(FALSE)
- if(GINKGO_WITH_CCACHE)
- message(WARNING "The CMAKE_CXX_COMPILER_LAUNCHER is set due to "
- "GINKGO_WITH_CCACHE=ON which is known to casue issues with CUDA
enabled "
diff --git
a/sci-libs/ginkgo/files/ginkgo-1.8.0-disable_automagic_dependencies.patch
b/sci-libs/ginkgo/files/ginkgo-1.8.0-disable_automagic_dependencies.patch
deleted file mode 100644
index c37259e3294a..000000000000
--- a/sci-libs/ginkgo/files/ginkgo-1.8.0-disable_automagic_dependencies.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 653d52a..c56af59 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -41,8 +41,7 @@ if(GINKGO_BUILD_EXTLIB_EXAMPLE)
- list(APPEND EXAMPLES_LIST external-lib-interfacing)
- endif()
-
--find_package(OpenCV QUIET)
--if(OpenCV_FOUND)
-+if(FALSE)
- list(APPEND EXAMPLES_LIST heat-equation schroedinger-splitting)
- else()
- message(STATUS "No OpenCV found, disabling examples with video output")
-@@ -56,8 +55,7 @@ if(GINKGO_BUILD_MPI)
- list(APPEND EXAMPLES_LIST distributed-solver)
- endif()
-
--find_package(Kokkos 4.1.00 QUIET)
--if(Kokkos_FOUND)
-+if(FALSE)
- list(APPEND EXAMPLES_LIST kokkos-assembly)
- else()
- message(STATUS "No Kokkos found, disabling examples with Kokkos
assembly.")
diff --git a/sci-libs/ginkgo/ginkgo-1.10.0.ebuild
b/sci-libs/ginkgo/ginkgo-1.10.0.ebuild
index c1dc674c295b..49f7f7bd00b4 100644
--- a/sci-libs/ginkgo/ginkgo-1.10.0.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.10.0.ebuild
@@ -26,10 +26,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}"/${P}-disable_automagic_dependencies.patch
-)
-
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
@@ -52,6 +48,7 @@ src_configure() {
-DGINKGO_BUILD_TESTS=OFF
-DGINKGO_BUILD_BENCHMARKS=OFF
-DGINKGO_BUILD_REFERENCE=ON
+ -DGINKGO_BUILD_EXAMPLES=OFF
-DGINKGO_BUILD_CUDA=$(usex cuda)
-DGINKGO_BUILD_HWLOC=$(usex hwloc)
-DGINKGO_BUILD_OMP=$(usex openmp)
diff --git a/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
b/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
index 0a4e3d5aea71..49f7f7bd00b4 100644
--- a/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -48,6 +48,7 @@ src_configure() {
-DGINKGO_BUILD_TESTS=OFF
-DGINKGO_BUILD_BENCHMARKS=OFF
-DGINKGO_BUILD_REFERENCE=ON
+ -DGINKGO_BUILD_EXAMPLES=OFF
-DGINKGO_BUILD_CUDA=$(usex cuda)
-DGINKGO_BUILD_HWLOC=$(usex hwloc)
-DGINKGO_BUILD_OMP=$(usex openmp)
diff --git a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
index c08e881a46e3..0fa033ee30a1 100644
--- a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-fix_type_mismatch.patch
- "${FILESDIR}"/${P}-disable_automagic_dependencies.patch
)
pkg_pretend() {
@@ -53,6 +52,7 @@ src_configure() {
-DGINKGO_BUILD_TESTS=OFF
-DGINKGO_BUILD_BENCHMARKS=OFF
-DGINKGO_BUILD_REFERENCE=ON
+ -DGINKGO_BUILD_EXAMPLES=OFF
-DGINKGO_BUILD_CUDA=$(usex cuda)
-DGINKGO_BUILD_HWLOC=$(usex hwloc)
-DGINKGO_BUILD_OMP=$(usex openmp)
diff --git a/sci-libs/ginkgo/ginkgo-1.8.0.ebuild
b/sci-libs/ginkgo/ginkgo-1.8.0.ebuild
index 028c8cdc3a77..49f7f7bd00b4 100644
--- a/sci-libs/ginkgo/ginkgo-1.8.0.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,10 +26,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}"/${P}-disable_automagic_dependencies.patch
-)
-
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
@@ -52,6 +48,7 @@ src_configure() {
-DGINKGO_BUILD_TESTS=OFF
-DGINKGO_BUILD_BENCHMARKS=OFF
-DGINKGO_BUILD_REFERENCE=ON
+ -DGINKGO_BUILD_EXAMPLES=OFF
-DGINKGO_BUILD_CUDA=$(usex cuda)
-DGINKGO_BUILD_HWLOC=$(usex hwloc)
-DGINKGO_BUILD_OMP=$(usex openmp)
