diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index 1ab63af0f5bbb..66765f917ad5c 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -1,4 +1,3 @@ -DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138 DIST hwloc-2.11.2.tar.bz2 5592269 BLAKE2B e4764883eb3678fba6d6bd30fba27d68bd15cefccfcbc9d628573447f5f507a348e197d5003cc016fd4e27da05dc8c0ebd8644a4530f8499016d255c62602fc2 SHA512 488bfdeb32d2b98cffc43a537e87422d70abcc2bc029e4b5c911fc3e37189a9213dc8efd5552e2fda0d2b03d4ec25ebd45e0680dd129da046798750c5f5eb72f DIST hwloc-2.12.2.tar.bz2 5617977 BLAKE2B 225d457ae01bcde2f342a175b7ab33d51fcbf6cb8ce02306569368758975d620b3ad4070c87ba16196c3a2e772658a6b4f841ba586a5d2ef922c1e60f72402c1 SHA512 949d6c9d7b858ee58e477b15e6c06f57812872142fa1c7f3ef20aae2e4ef954135f839e8604404bfd0637fde99729c7d00211c8aee860dfde9ac60bba0e78aef DIST lstopo.png 18008 BLAKE2B 5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75 SHA512 8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823 diff --git a/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild b/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild deleted file mode 100644 index cf7438c1aa1c1..0000000000000 --- a/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools cuda flag-o-matic multilib-minimal toolchain-funcs - -MY_PV=v$(ver_cut 1-2) - -DESCRIPTION="Displays the hardware topology in convenient formats" -HOMEPAGE="https://www.open-mpi.org/projects/hwloc/" -SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86" -IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X" - -# opencl support dropped with x11-drivers/ati-drivers being removed (#582406). -# Anyone with hardware is welcome to step up and help test to get it re-added. - -# dev-util/nvidia-cuda-toolkit is always multilib - -RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] - cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg(+)?,${MULTILIB_USEDEP}] ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) - pci? ( - >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}] - >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] - ) - plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] ) - numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] ) - xml? ( >=dev-libs/libxml2-2.9.1-r4:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) -DOCS=( AUTHORS NEWS README VERSION ) - -src_prepare() { - default - eautoreconf - - if use cuda ; then - append-cflags -I"${ESYSROOT}"/opt/cuda/include - append-cppflags -I"${ESYSROOT}"/opt/cuda/include - fi -} - -multilib_src_configure() { - export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467 - - if use cuda ; then - local -x LDFLAGS="${LDFLAGS}" - append-ldflags -L"${ESYSROOT}"/opt/cuda/$(get_libdir) - fi - - ECONF_SOURCE=${S} econf \ - --disable-opencl \ - $(use_enable static-libs static) \ - $(use_enable cairo) \ - $(multilib_native_use_enable cuda) \ - $(use_enable debug) \ - $(multilib_native_use_enable gl) \ - $(use_enable pci) \ - $(use_enable plugins) \ - $(use_enable numa libnuma) \ - $(use_enable xml libxml2) \ - $(use_with X x) -} diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml index 20d71fb7afa11..1f4741f9df29d 100644 --- a/sys-apps/hwloc/metadata.xml +++ b/sys-apps/hwloc/metadata.xml @@ -17,12 +17,9 @@ Enable the Cairo back-end of hwloc's lstopo command Enable the cpuid-based architecture specific support (x86 component) Enable CUDA device discovery using libcudart - Enable GL display device discovery (NVCtrl) Enable oneAPI Level Zero device discovery - Add support for numa memory allocation Enable the NVML device discovery Enable PCI device discovery using libpci - Build hwloc components as plugins so that the hwloc core library does not directly depend on their dependencies (for instance the libpci library) Enable AMD RSMI device discovery Enable GL display device discovery (NVCtrl) use libxml2 for XML support, instead of a custom minimalistic support