From 43b629de2a8aac8720c4dbc3e234a4d66e9e10707d1b0e61d982960e022df4b1 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 16 May 2023 14:16:44 +0000 Subject: [PATCH] Accepting request 1087175 from home:tsaupe:branches:devel:libraries:c_c++:hwloc-PED-4156 resync devel repo with latest maintenance update (jsc#PED-4156) OBS-URL: https://build.opensuse.org/request/show/1087175 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=56 --- hwloc.changes | 7 +++++++ hwloc.spec | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/hwloc.changes b/hwloc.changes index 50e2bba..add3525 100644 --- a/hwloc.changes +++ b/hwloc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 9 13:20:12 UTC 2023 - Thomas Blume + +- remove header files for feature we don't ship (jsc#PED-4156) + ------------------------------------------------------------------- Thu Jan 26 14:53:18 UTC 2023 - Callum Farmer @@ -52,6 +57,8 @@ Mon Jul 11 07:47:23 UTC 2022 - Dirk Müller * Misc + Add --disable-readme to avoid regenerating the top-level hwloc README file from the documentation. + * Bugfix + + Use setenv() instead of putenv() - fixes crash in Slurm (bsc#1210227) ------------------------------------------------------------------- Fri Apr 8 16:42:15 UTC 2022 - Dirk Müller diff --git a/hwloc.spec b/hwloc.spec index 22b42cd..b710358 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,7 +1,7 @@ # # spec file for package hwloc # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global lname libhwloc15 Name: hwloc Version: 2.9.0 @@ -122,6 +123,14 @@ install -D -m 644 %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %{buil %endif rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service +#remove headers for features we don't ship +rm %{buildroot}%{_includedir}/hwloc/rsmi.h +rm %{buildroot}%{_includedir}/hwloc/nvml.h +rm %{buildroot}%{_includedir}/hwloc/opencl.h +rm %{buildroot}%{_includedir}/hwloc/levelzero.h +rm %{buildroot}%{_includedir}/hwloc/cuda.h +rm %{buildroot}%{_includedir}/hwloc/cudart.h + %fdupes -s %{buildroot}/%{_mandir}/man1 %fdupes -s %{buildroot}/%{_mandir}/man7