sci-physics/fastjet: CMake patches

Three issues with CMake are addressed: 1. fastjet-config did not know about HAS_SHARED property 2. Installing no plugins failed, because of empty library 3. Not enabling all plugins should disable all plugins like old autotools setup Closes: https://bugs.gentoo.org/962836 Part-of: https://github.com/gentoo/gentoo/pull/43924 Closes: https://github.com/gentoo/gentoo/pull/43924 Signed-off-by: Alexander Puck Neuwirth <apn-pucky@gentoo.org>
2026-09-24 17:09:10 -07:00 · 2025-09-24 16:08:32 +02:00
parent c7465ad426
commit 5f8a3b5234
4 changed files with 279 additions and 1 deletions
--- a/sci-physics/fastjet/fastjet-3.5.1-r2.ebuild
+++ b/sci-physics/fastjet/fastjet-3.5.1-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=plugins
+PYTHON_COMPAT=( python3_{11..13} )
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="
+	media-gfx/graphviz
+	media-libs/freetype
+	virtual/latex-base
+"
+
+inherit cmake docs fortran-2 python-single-r1
+
+DESCRIPTION="A software package for jet finding in pp and e+e- collisions"
+HOMEPAGE="https://fastjet.fr/"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/fastjet/fastjet"
+else
+	SRC_URI="https://fastjet.fr/repo/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="cgal examples python +plugins"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) examples? ( plugins )"
+
+# cgal is header-only in version 5.4 and up. We need to use the
+# special --enable-cgal-header-only argument to use these versions.
+DEPEND="
+	cgal? ( >=sci-mathematics/cgal-5.4:=[shared(+)] )
+	plugins? ( >=sci-physics/siscone-3.1.2-r1:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# https://bugs.gentoo.org/962836
+	"${FILESDIR}"/${PN}-3.5.1-cmakeplugins.patch
+	"${FILESDIR}"/${PN}-3.5.1-cmakerpath.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	fortran-2_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFASTJET_ENABLE_CGAL=$(usex cgal)
+		-DFASTJET_ENABLE_ALLPLUGINS=$(usex plugins)
+		-DFASTJET_ENABLE_ALLCXXPLUGINS=$(usex plugins)
+		-DFASTJET_ENABLE_PYTHON=$(usex python)
+		-DFASTJET_BUILD_EXAMPLES=$(usex examples)
+		-DFASTJET_HAVE_AUTO_PTR_INTERFACE=OFF
+		-DFASTJET_USE_INSTALLED_SISCONE=ON
+	)
+	use python && mycmakeargs+=(
+		-DFASTJET_CUSTOM_PYTHON_INSTALL="$(python_get_sitedir)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/sci-physics/fastjet/fastjet-9999.ebuild
+++ b/sci-physics/fastjet/fastjet-9999.ebuild
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="cgal examples python +plugins"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) examples? ( plugins )"

 # cgal is header-only in version 5.4 and up. We need to use the
 # special --enable-cgal-header-only argument to use these versions.
--- a/sci-physics/fastjet/files/fastjet-3.5.1-cmakeplugins.patch
+++ b/sci-physics/fastjet/files/fastjet-3.5.1-cmakeplugins.patch
@@ -0,0 +1,159 @@
+https://gitlab.com/fastjet/fastjet/-/merge_requests/28
+https://bugs.gentoo.org/962836
+diff --git c/CMakeLists.txt w/CMakeLists.txt
+index 4b4bb6fe..bc9d3f9f 100644
+--- c/CMakeLists.txt
+++ w/CMakeLists.txt
+@@ -150,10 +150,11 @@ option(FASTJET_ENABLE_PLUGIN_D0RUNIICONE      "Enable the D0RunIICone plugin [de
+ option(FASTJET_ENABLE_PLUGIN_PXCONE           "Enable the PxCone plugin [default=OFF]"           OFF)
+ option(FASTJET_ENABLE_PLUGIN_TRACKJET         "Enable the TrackJet plugin [default=OFF]"         OFF)
+ 
+-option(FASTJET_ENABLE_ALLCXXPLUGINS           "Enable all the C++ plugins [default=OFF]"       OFF)
+-option(FASTJET_ENABLE_ALLPLUGINS              "Enable all the plugins [default=OFF]"           OFF)
+option(FASTJET_ENABLE_ALLCXXPLUGINS           "Enable all the C++ plugins [default=unset]"       "")
+option(FASTJET_ENABLE_ALLPLUGINS              "Enable all the plugins [default=unset]"           "")
+ 
+-if (FASTJET_ENABLE_ALLCXXPLUGINS OR FASTJET_ENABLE_ALLPLUGINS)
+if(NOT FASTJET_ENABLE_ALLCXXPLUGINS STREQUAL "")
+if (FASTJET_ENABLE_ALLCXXPLUGINS)
+   set(FASTJET_ENABLE_PLUGIN_ATLASCONE          ON)
+   set(FASTJET_ENABLE_PLUGIN_CDFCONES           ON)
+   set(FASTJET_ENABLE_PLUGIN_CMSITERATIVECONE   ON)
+@@ -165,10 +166,49 @@ if (FASTJET_ENABLE_ALLCXXPLUGINS OR FASTJET_ENABLE_ALLPLUGINS)
+   set(FASTJET_ENABLE_PLUGIN_NESTEDDEFS         ON)
+   set(FASTJET_ENABLE_PLUGIN_SISCONE            ON)
+   set(FASTJET_ENABLE_PLUGIN_TRACKJET           ON)
+else()
+  set(FASTJET_ENABLE_PLUGIN_ATLASCONE          OFF)
+  set(FASTJET_ENABLE_PLUGIN_CDFCONES           OFF)
+  set(FASTJET_ENABLE_PLUGIN_CMSITERATIVECONE   OFF)
+  set(FASTJET_ENABLE_PLUGIN_D0RUNICONE         OFF)
+  set(FASTJET_ENABLE_PLUGIN_D0RUNIICONE        OFF)
+  set(FASTJET_ENABLE_PLUGIN_EECAMBRIDGE        OFF)
+  set(FASTJET_ENABLE_PLUGIN_GRIDJET            OFF)
+  set(FASTJET_ENABLE_PLUGIN_JADE               OFF)
+  set(FASTJET_ENABLE_PLUGIN_NESTEDDEFS         OFF)
+  set(FASTJET_ENABLE_PLUGIN_SISCONE            OFF)
+  set(FASTJET_ENABLE_PLUGIN_TRACKJET           OFF)
+endif()
+ endif()
+ 
+if(NOT FASTJET_ENABLE_ALLPLUGINS STREQUAL "")
+ if (FASTJET_ENABLE_ALLPLUGINS)
+   set(FASTJET_ENABLE_PLUGIN_PXCONE             ON)
+  set(FASTJET_ENABLE_PLUGIN_ATLASCONE          ON)
+  set(FASTJET_ENABLE_PLUGIN_CDFCONES           ON)
+  set(FASTJET_ENABLE_PLUGIN_CMSITERATIVECONE   ON)
+  set(FASTJET_ENABLE_PLUGIN_D0RUNICONE         ON)
+  set(FASTJET_ENABLE_PLUGIN_D0RUNIICONE        ON)
+  set(FASTJET_ENABLE_PLUGIN_EECAMBRIDGE        ON)
+  set(FASTJET_ENABLE_PLUGIN_GRIDJET            ON)
+  set(FASTJET_ENABLE_PLUGIN_JADE               ON)
+  set(FASTJET_ENABLE_PLUGIN_NESTEDDEFS         ON)
+  set(FASTJET_ENABLE_PLUGIN_SISCONE            ON)
+  set(FASTJET_ENABLE_PLUGIN_TRACKJET           ON)
+else()
+  set(FASTJET_ENABLE_PLUGIN_PXCONE             OFF)
+  set(FASTJET_ENABLE_PLUGIN_ATLASCONE          OFF)
+  set(FASTJET_ENABLE_PLUGIN_CDFCONES           OFF)
+  set(FASTJET_ENABLE_PLUGIN_CMSITERATIVECONE   OFF)
+  set(FASTJET_ENABLE_PLUGIN_D0RUNICONE         OFF)
+  set(FASTJET_ENABLE_PLUGIN_D0RUNIICONE        OFF)
+  set(FASTJET_ENABLE_PLUGIN_EECAMBRIDGE        OFF)
+  set(FASTJET_ENABLE_PLUGIN_GRIDJET            OFF)
+  set(FASTJET_ENABLE_PLUGIN_JADE               OFF)
+  set(FASTJET_ENABLE_PLUGIN_NESTEDDEFS         OFF)
+  set(FASTJET_ENABLE_PLUGIN_SISCONE            OFF)
+  set(FASTJET_ENABLE_PLUGIN_TRACKJET           OFF)
+endif()
+ endif()
+ 
+ # compile-time debugging info
+diff --git c/plugins/CMakeLists.txt w/plugins/CMakeLists.txt
+index a44294c3..5dcbd51b 100644
+--- c/plugins/CMakeLists.txt
+++ w/plugins/CMakeLists.txt
+@@ -71,43 +71,47 @@ endif()
+ # make sure the parent gets access to the list of plugins
+ set(LIST_ALL_PLUGINS "${LIST_ALL_PLUGINS}" PARENT_SCOPE)
+ 
+-# build a local library
+-add_library(fastjetplugins SHARED ${combined_objects})
+-target_link_libraries(fastjetplugins PUBLIC fastjet)
+# if no plugins were selected, we should not try to build an empty library
+list(LENGTH combined_objects num_objects)
+if (num_objects GREATER 0)
+   # build a local library
+   add_library(fastjetplugins SHARED ${combined_objects})
+   target_link_libraries(fastjetplugins PUBLIC fastjet)
+ 
+-target_include_directories(fastjetplugins PUBLIC 
+-                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Jade>
+-                             $<INSTALL_INTERFACE:include>
+-                           )
+   target_include_directories(fastjetplugins PUBLIC 
+                                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Jade>
+                                $<INSTALL_INTERFACE:include>
+                              )
+ 
+-add_library(fastjet::fastjetplugins ALIAS fastjetplugins)
+   add_library(fastjet::fastjetplugins ALIAS fastjetplugins)
+ 
+-# NB this is specifically for building scikit-hep/fastjet wheels
+-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-  set_target_properties(fastjetplugins PROPERTIES INSTALL_RPATH "@loader_path")
+-else()
+-  set_target_properties(fastjetplugins PROPERTIES INSTALL_RPATH "$ORIGIN")
+-endif()
+   # NB this is specifically for building scikit-hep/fastjet wheels
+   if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+     set_target_properties(fastjetplugins PROPERTIES INSTALL_RPATH "@loader_path")
+   else()
+     set_target_properties(fastjetplugins PROPERTIES INSTALL_RPATH "$ORIGIN")
+   endif()
+ 
+-# make sure the SISCone libraries are included if necessary
+-if (FASTJET_ENABLE_PLUGIN_SISCONE)
+-   target_link_libraries(fastjetplugins PUBLIC siscone::siscone siscone::siscone_spherical)
+-endif()
+   # make sure the SISCone libraries are included if necessary
+   if (FASTJET_ENABLE_PLUGIN_SISCONE)
+      target_link_libraries(fastjetplugins PUBLIC siscone::siscone siscone::siscone_spherical)
+   endif()
+ 
+-# here we specify that runtime library components (e.g. .dlls, but not .so or .dylib)
+-# go into the binary directory (e.g. /bin, rather than the library directory e.g /lib)
+-# this is typical organization on windows installs
+-install(TARGETS
+-          fastjetplugins
+-        EXPORT
+-          FastjetTargets
+-        RUNTIME
+-          COMPONENT Runtime
+-          DESTINATION ${CMAKE_INSTALL_BINDIR}
+-        LIBRARY
+-          COMPONENT Runtime
+-          DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        ARCHIVE
+-          COMPONENT Development
+-          DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        )
+   # here we specify that runtime library components (e.g. .dlls, but not .so or .dylib)
+   # go into the binary directory (e.g. /bin, rather than the library directory e.g /lib)
+   # this is typical organization on windows installs
+   install(TARGETS
+             fastjetplugins
+           EXPORT
+             FastjetTargets
+           RUNTIME
+             COMPONENT Runtime
+             DESTINATION ${CMAKE_INSTALL_BINDIR}
+           LIBRARY
+             COMPONENT Runtime
+             DESTINATION ${CMAKE_INSTALL_LIBDIR}
+           ARCHIVE
+             COMPONENT Development
+             DESTINATION ${CMAKE_INSTALL_LIBDIR}
+           )
+endif()
+\ No newline at end of file
--- a/sci-physics/fastjet/files/fastjet-3.5.1-cmakerpath.patch
+++ b/sci-physics/fastjet/files/fastjet-3.5.1-cmakerpath.patch
@@ -0,0 +1,34 @@
+https://gitlab.com/fastjet/fastjet/-/merge_requests/29
+From c47b6dca4e6d7b5bed5e73366b9adcac25f78a0f Mon Sep 17 00:00:00 2001
+From: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
+Date: Sun, 21 Sep 2025 12:35:13 +0200
+Subject: [PATCH] Forward CMake BUILD_SHARED_LIBS as HAS_SHARED to
+ fastjet-config generation
+
+Closes: https://gitlab.com/fastjet/fastjet/-/issues/8
+---
+ CMakeLists.txt | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4b4bb6fe..31a61966 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -398,6 +398,14 @@ set(CONFIG_LIBS_PLUGINS "-lfastjetplugins")
+ if (FASTJET_ENABLE_PLUGIN_SISCONE) 
+   set(CONFIG_LIBS_PLUGINS "${CONFIG_LIBS_PLUGINS} -lsiscone -lsiscone_spherical")
+ endif()
+
+# Set shared library variables
+if (BUILD_SHARED_LIBS OR NOT DEFINED BUILD_SHARED_LIBS)
+  set(HAS_SHARED "yes")
+else()
+  set(HAS_SHARED "no")
+endif()
+
+ configure_file(fastjet-config.in fastjet-config)
+ 
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fastjet-config DESTINATION ${CMAKE_INSTALL_BINDIR})
+-- 
+GitLab
+