From 4b698b837c5b40c1a0ca8c9f6a973622216819d7b1d07bb8b7a519e3b95d0115 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Mon, 5 Jun 2023 11:25:33 +0000 Subject: [PATCH 1/2] Accepting request 1090862 from home:tsaupe:branches:devel:libraries:c_c++:hwloc-PED-4156 - remove header files for feature we don't ship (jsc#PED-4156) resubmit of: https://build.opensuse.org/request/show/1087436 reasoning see there OBS-URL: https://build.opensuse.org/request/show/1090862 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=59 --- hwloc.changes | 5 +++++ hwloc.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/hwloc.changes b/hwloc.changes index 17557bf..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 diff --git a/hwloc.spec b/hwloc.spec index d6466c0..b710358 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -123,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 From 2c255bb60afa5ccf90689ddf3f083d8a87c21ed81611582018aee329889022dd Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Mon, 5 Jun 2023 12:03:42 +0000 Subject: [PATCH 2/2] Accepting request 1090898 from home:tsaupe:branches:devel:libraries:c_c++:hwloc-PED-4156 remove header files for feature we don't ship (jsc#PED-4156) OBS-URL: https://build.opensuse.org/request/show/1090898 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=60 --- hwloc.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hwloc.changes b/hwloc.changes index add3525..c633c5c 100644 --- a/hwloc.changes +++ b/hwloc.changes @@ -3,6 +3,12 @@ Tue May 9 13:20:12 UTC 2023 - Thomas Blume - remove header files for feature we don't ship (jsc#PED-4156) +These headers do not define an API that is not supported at present and +therefore would not cause a failure during build. Still, they define static +inline functions which look for HWLOC objects that are only set up by +non-supported device scanners. Thus these objects will never be present - even +though the relevant hardware is. + ------------------------------------------------------------------- Thu Jan 26 14:53:18 UTC 2023 - Callum Farmer