1 |
commit: 9eba4c8d45a806d2e757c67b832e991608143029 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 29 22:30:24 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 29 22:43:35 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eba4c8d |
7 |
|
8 |
sys-apps/hwloc: add 2.6.0 |
9 |
|
10 |
We drop netloc support as it's about to be removed upstream. |
11 |
|
12 |
Bug: https://github.com/open-mpi/hwloc/issues/478 |
13 |
Closes: https://bugs.gentoo.org/796797 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
sys-apps/hwloc/Manifest | 1 + |
17 |
sys-apps/hwloc/hwloc-2.6.0.ebuild | 104 ++++++++++++++++++++++++++++++++++++++ |
18 |
2 files changed, 105 insertions(+) |
19 |
|
20 |
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest |
21 |
index 3f39e4ffc93..014c8ec0890 100644 |
22 |
--- a/sys-apps/hwloc/Manifest |
23 |
+++ b/sys-apps/hwloc/Manifest |
24 |
@@ -1,3 +1,4 @@ |
25 |
DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138 |
26 |
DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c |
27 |
DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd |
28 |
+DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df |
29 |
|
30 |
diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild b/sys-apps/hwloc/hwloc-2.6.0.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..e9b6ea7e9d1 |
33 |
--- /dev/null |
34 |
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild |
35 |
@@ -0,0 +1,104 @@ |
36 |
+# Copyright 1999-2021 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI="7" |
40 |
+ |
41 |
+inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal |
42 |
+ |
43 |
+MY_PV="v$(ver_cut 1-2)" |
44 |
+ |
45 |
+DESCRIPTION="displays the hardware topology in convenient formats" |
46 |
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/" |
47 |
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2" |
48 |
+ |
49 |
+LICENSE="BSD" |
50 |
+SLOT="0/15" |
51 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" |
52 |
+IUSE="cairo +cpuid cuda debug gl nvml +pci static-libs svg udev xml X" |
53 |
+ |
54 |
+# opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406). |
55 |
+# Anyone with hardware is welcome to step up and help test to get it re-added. |
56 |
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] |
57 |
+ |
58 |
+ cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] ) |
59 |
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) |
60 |
+ gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) |
61 |
+ nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] ) |
62 |
+ pci? ( |
63 |
+ >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}] |
64 |
+ >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] |
65 |
+ ) |
66 |
+ udev? ( virtual/libudev ) |
67 |
+ xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )" |
68 |
+DEPEND="${RDEPEND}" |
69 |
+# 2.69-r5 for --runstatedir |
70 |
+BDEPEND=" |
71 |
+ >=sys-devel/autoconf-2.69-r5 |
72 |
+ virtual/pkgconfig |
73 |
+" |
74 |
+ |
75 |
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) |
76 |
+ |
77 |
+DOCS=( AUTHORS NEWS README VERSION ) |
78 |
+ |
79 |
+src_prepare() { |
80 |
+ default |
81 |
+ |
82 |
+ eautoreconf |
83 |
+ |
84 |
+ if use cuda ; then |
85 |
+ append-cflags "-I${ESYSROOT}/opt/cuda/include" |
86 |
+ append-cppflags "-I${ESYSROOT}/opt/cuda/include" |
87 |
+ fi |
88 |
+} |
89 |
+ |
90 |
+multilib_src_configure() { |
91 |
+ # bug #393467 |
92 |
+ export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" |
93 |
+ |
94 |
+ if use cuda ; then |
95 |
+ local -x LDFLAGS="${LDFLAGS}" |
96 |
+ append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)" |
97 |
+ fi |
98 |
+ |
99 |
+ local myconf=( |
100 |
+ --disable-opencl |
101 |
+ # netloc is deprecated upstream, about to be removed |
102 |
+ # bug #796797 |
103 |
+ --disable-netloc |
104 |
+ --disable-plugin-ltdl |
105 |
+ --enable-plugins |
106 |
+ --enable-shared |
107 |
+ --runstatedir="${EPREFIX}/run" |
108 |
+ $(multilib_native_use_enable cuda) |
109 |
+ $(multilib_native_use_enable gl) |
110 |
+ $(use_enable cairo) |
111 |
+ $(use_enable cpuid) |
112 |
+ $(use_enable debug) |
113 |
+ $(use_enable udev libudev) |
114 |
+ $(use_enable nvml) |
115 |
+ $(use_enable pci) |
116 |
+ $(use_enable static-libs static) |
117 |
+ $(use_enable xml libxml2) |
118 |
+ $(use_with X x) |
119 |
+ ) |
120 |
+ |
121 |
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" |
122 |
+} |
123 |
+ |
124 |
+multilib_src_install_all() { |
125 |
+ default |
126 |
+ |
127 |
+ case ${ARCH} in |
128 |
+ # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. |
129 |
+ amd64|x86) |
130 |
+ systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;; |
131 |
+ esac |
132 |
+ |
133 |
+ mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die |
134 |
+ bashcomp_alias hwloc-annotate \ |
135 |
+ hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} |
136 |
+ bashcomp_alias hwloc-annotate lstopo{,-no-graphics} |
137 |
+ |
138 |
+ find "${ED}" -name '*.la' -delete || die |
139 |
+} |