Diff hwloc-2.6.0-r1 with a hwloc-2.8.0-r1

/usr/portage/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild 2023-10-09 14:52:35.376368499 +0300
1 1
# Copyright 1999-2022 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI="7"
4
EAPI=8
5 5

  
6
inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
6
inherit autotools bash-completion-r1 cuda desktop flag-o-matic systemd toolchain-funcs multilib-minimal
7 7

  
8 8
MY_PV="v$(ver_cut 1-2)"
9

  
10 9
DESCRIPTION="Displays the hardware topology in convenient formats"
11 10
HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
12
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
11
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
12
	https://raw.githubusercontent.com/open-mpi/hwloc/master/contrib/android/assets/lstopo.png"
13 13

  
14 14
LICENSE="BSD"
15 15
SLOT="0/15"
16
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
17
IUSE="cairo +cpuid cuda debug gl nvml +pci static-libs svg udev xml X"
16
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
17
IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia"
18 18

  
19
# opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
20
# Anyone with hardware is welcome to step up and help test to get it re-added.
21
RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
22

  
23
	cairo?		( >=x11-libs/cairo-1.12.14-r4[X?,svg(+)?,${MULTILIB_USEDEP}] )
24
	cuda?		( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
25
	gl?		( x11-drivers/nvidia-drivers[static-libs,tools] )
26
	nvml?		( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
27
	pci?		(
28
				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
29
				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
30
			)
31
	udev?	( virtual/libudev )
32
	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
19
# opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
20
#         anyone with hardware is welcome to step up and help test to get it re-added.
21
# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4
22
RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
23
	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg(+)?,${MULTILIB_USEDEP}] )
24
	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
25
	nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
26
	pci? (
27
		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
28
		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
29
	)
30
	udev? ( virtual/libudev:= )
31
	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
32
	video_cards_nvidia? (
33
		x11-drivers/nvidia-drivers[static-libs]
34
		x11-libs/libXext
35
		x11-libs/libX11
36
	)"
33 37
DEPEND="${RDEPEND}"
34 38
# 2.69-r5 for --runstatedir
35
BDEPEND="
36
	>=sys-devel/autoconf-2.69-r5
37
	virtual/pkgconfig
38
"
39
BDEPEND=">=sys-devel/autoconf-2.69-r5
40
	virtual/pkgconfig"
39 41

  
40 42
PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
41 43

  
......
45 47
	default
46 48

  
47 49
	eautoreconf
48

  
49
	if use cuda ; then
50
		append-cflags "-I${ESYSROOT}/opt/cuda/include"
51
		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
52
	fi
53 50
}
54 51

  
55 52
multilib_src_configure() {
56 53
	# bug #393467
57 54
	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)"
58 55

  
56
	if use video_cards_nvidia ; then
57
		addpredict /dev/nvidiactl
58
	fi
59

  
59 60
	if use cuda ; then
61
		append-cflags "-I${ESYSROOT}/opt/cuda/include"
62
		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
63

  
60 64
		local -x LDFLAGS="${LDFLAGS}"
61 65
		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
62 66
	fi
63 67

  
64 68
	local myconf=(
65 69
		--disable-opencl
70

  
66 71
		# netloc is deprecated upstream, about to be removed
67 72
		# bug #796797
68 73
		--disable-netloc
74

  
69 75
		--disable-plugin-ltdl
70 76
		--enable-plugins
71 77
		--enable-shared
72 78
		--runstatedir="${EPREFIX}/run"
73 79
		$(multilib_native_use_enable cuda)
74
		$(multilib_native_use_enable gl)
80
		$(multilib_native_use_enable video_cards_nvidia gl)
75 81
		$(use_enable cairo)
76 82
		$(use_enable cpuid)
77 83
		$(use_enable debug)
......
92 98
	case ${ARCH} in
93 99
		# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
94 100
		amd64|x86)
95
			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;;
101
			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service"
102
		;;
96 103
	esac
97 104

  
98 105
	mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
......
101 108
	bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
102 109

  
103 110
	find "${ED}" -name '*.la' -delete || die
111
	doicon "${DISTDIR}/lstopo.png"
104 112
}
Thank you!