From e2d4b3471565be288aab00fd1c346079145d5daa Mon Sep 17 00:00:00 2001
From: fritzkink <96341974+fritzkink@users.noreply.github.com>
Date: Mon, 12 Jun 2023 21:34:50 +0200
Subject: [PATCH] hwloc - update to version 2.8.0

---
 components/developer/hwloc/Makefile                      |   19 -
 /dev/null                                                |  138 -----------------
 components/developer/hwloc/hwloc.p5m                     |  126 ++++++++++++---
 components/developer/hwloc/pkg5                          |    2 
 components/developer/hwloc/manifests/sample-manifest.p5m |  128 ++++++++++++---
 components/developer/hwloc/test/results-all.master       |   38 +++-
 6 files changed, 234 insertions(+), 217 deletions(-)

diff --git a/components/developer/hwloc/Makefile b/components/developer/hwloc/Makefile
index 8905da3..fd04b29 100644
--- a/components/developer/hwloc/Makefile
+++ b/components/developer/hwloc/Makefile
@@ -16,8 +16,8 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         hwloc
-COMPONENT_VERSION_MAJOR=2.0
-COMPONENT_VERSION=      $(COMPONENT_VERSION_MAJOR).1
+COMPONENT_VERSION_MAJOR=2.8
+COMPONENT_VERSION=      $(COMPONENT_VERSION_MAJOR).0
 COMPONENT_SUMMARY=      hwloc - Portable Hardware Locality
 COMPONENT_PROJECT_URL=  https://www.open-mpi.org/projects/hwloc/
 COMPONENT_FMRI=         developer/hwloc
@@ -26,16 +26,13 @@
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_URL= \
   https://www.open-mpi.org/software/hwloc/v$(COMPONENT_VERSION_MAJOR)/downloads/$(COMPONENT_ARCHIVE)
-COMPONENT_ARCHIVE_HASH= \
-  sha256:b97575cc26751f252b5c9f5c00be94cab66977da2e127456a5ae2418649ec049
+COMPONENT_ARCHIVE_HASH= sha256:348a72fcd48c32a823ee1da149ae992203e7ad033549e64aed6ea6eeb01f42c1
 COMPONENT_LICENSE=      BSD-2
 
 # When CONFIGURE_FIX_LIBTOOL_RPATH is integrated, we can remove local fix and enable it
 CONFIGURE_FIX_LIBTOOL_RPATH = no
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/common.mk
 
 CONFIGURE_OPTIONS+= --enable-cairo
 CONFIGURE_OPTIONS+= --enable-cpuid
@@ -53,21 +50,15 @@
         '-e "/FAIL:/p" ' \
         '-e "/ERROR:/p" '
 
-build:		$(BUILD_32_and_64)
-
-install:	$(INSTALL_32_and_64)
-
-test:		$(TEST_32_and_64)
-
 # Build dependencies
 REQUIRED_PACKAGES += system/header/header-picl
 
 # Auto-generated dependencies
-REQUIRED_PACKAGES += SUNWcs
 REQUIRED_PACKAGES += diagnostic/scanpci
 REQUIRED_PACKAGES += library/desktop/cairo
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += service/picl
+REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += x11/library/libx11
diff --git a/components/developer/hwloc/hwloc.p5m b/components/developer/hwloc/hwloc.p5m
index b2452f0..890c91a 100644
--- a/components/developer/hwloc/hwloc.p5m
+++ b/components/developer/hwloc/hwloc.p5m
@@ -14,6 +14,7 @@
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="$(COMPONENT_SUMMARY)"
 set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,19 +23,6 @@
 
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
-file path=usr/bin/$(MACH32)/hwloc-annotate
-file path=usr/bin/$(MACH32)/hwloc-bind
-file path=usr/bin/$(MACH32)/hwloc-calc
-file path=usr/bin/$(MACH32)/hwloc-compress-dir
-file path=usr/bin/$(MACH32)/hwloc-diff
-file path=usr/bin/$(MACH32)/hwloc-distrib
-file path=usr/bin/$(MACH32)/hwloc-gather-cpuid
-file path=usr/bin/$(MACH32)/hwloc-info
-link path=usr/bin/$(MACH32)/hwloc-ls target=lstopo-no-graphics
-file path=usr/bin/$(MACH32)/hwloc-patch
-file path=usr/bin/$(MACH32)/hwloc-ps
-file path=usr/bin/$(MACH32)/lstopo
-file path=usr/bin/$(MACH32)/lstopo-no-graphics
 file path=usr/bin/hwloc-annotate
 file path=usr/bin/hwloc-bind
 file path=usr/bin/hwloc-calc
@@ -51,6 +39,7 @@
 file path=usr/include/hwloc.h
 file path=usr/include/hwloc/autogen/config.h
 file path=usr/include/hwloc/bitmap.h
+file path=usr/include/hwloc/cpukinds.h
 file path=usr/include/hwloc/cuda.h
 file path=usr/include/hwloc/cudart.h
 file path=usr/include/hwloc/deprecated.h
@@ -60,25 +49,32 @@
 file path=usr/include/hwloc/gl.h
 file path=usr/include/hwloc/helper.h
 file path=usr/include/hwloc/inlines.h
-file path=usr/include/hwloc/intel-mic.h
+file path=usr/include/hwloc/levelzero.h
+file path=usr/include/hwloc/memattrs.h
 file path=usr/include/hwloc/nvml.h
 file path=usr/include/hwloc/opencl.h
 file path=usr/include/hwloc/openfabrics-verbs.h
 file path=usr/include/hwloc/plugins.h
 file path=usr/include/hwloc/rename.h
+file path=usr/include/hwloc/rsmi.h
 file path=usr/include/hwloc/shmem.h
 file path=usr/include/hwloc/solaris-chiptype.h
-link path=usr/lib/$(MACH64)/libhwloc.so target=libhwloc.so.15.0.0
-link path=usr/lib/$(MACH64)/libhwloc.so.15 target=libhwloc.so.15.0.0
-file path=usr/lib/$(MACH64)/libhwloc.so.15.0.0
+link path=usr/lib/$(MACH64)/libhwloc.so target=libhwloc.so.15.6.0
+link path=usr/lib/$(MACH64)/libhwloc.so.15 target=libhwloc.so.15.6.0
+file path=usr/lib/$(MACH64)/libhwloc.so.15.6.0
 file path=usr/lib/$(MACH64)/pkgconfig/hwloc.pc
-link path=usr/lib/libhwloc.so target=libhwloc.so.15.0.0
-link path=usr/lib/libhwloc.so.15 target=libhwloc.so.15.0.0
-file path=usr/lib/libhwloc.so.15.0.0
-file path=usr/lib/pkgconfig/hwloc.pc
 file path=usr/share/applications/lstopo.desktop
+file path=usr/share/bash-completion/completions/hwloc
+file path=usr/share/doc/hwloc/dynamic_SVG_example.html
 file path=usr/share/doc/hwloc/hwloc-a4.pdf
 file path=usr/share/doc/hwloc/hwloc-letter.pdf
+file path=usr/share/hwloc/hwloc-ps.www/README
+file path=usr/share/hwloc/hwloc-ps.www/assets/index.html
+file path=usr/share/hwloc/hwloc-ps.www/assets/main.css
+file path=usr/share/hwloc/hwloc-ps.www/assets/script.js
+file path=usr/share/hwloc/hwloc-ps.www/assets/style.css
+file path=usr/share/hwloc/hwloc-ps.www/client.js
+file path=usr/share/hwloc/hwloc-ps.www/package.json
 file path=usr/share/hwloc/hwloc-valgrind.supp
 file path=usr/share/hwloc/hwloc.dtd
 file path=usr/share/hwloc/hwloc2-diff.dtd
@@ -96,6 +92,9 @@
 file path=usr/share/man/man1/hwloc-ps.1
 file path=usr/share/man/man1/lstopo-no-graphics.1
 link path=usr/share/man/man1/lstopo.1 target=lstopo-no-graphics.1
+file path=usr/share/man/man3/HWLOC_ALLOW_FLAG_ALL.3
+file path=usr/share/man/man3/HWLOC_ALLOW_FLAG_CUSTOM.3
+file path=usr/share/man/man3/HWLOC_ALLOW_FLAG_LOCAL_RESTRICTIONS.3
 file path=usr/share/man/man3/HWLOC_API_VERSION.3
 file path=usr/share/man/man3/HWLOC_CPUBIND_NOMEMBIND.3
 file path=usr/share/man/man3/HWLOC_CPUBIND_PROCESS.3
@@ -107,7 +106,23 @@
 file path=usr/share/man/man3/HWLOC_DISTANCES_KIND_FROM_USER.3
 file path=usr/share/man/man3/HWLOC_DISTANCES_KIND_MEANS_BANDWIDTH.3
 file path=usr/share/man/man3/HWLOC_DISTANCES_KIND_MEANS_LATENCY.3
+file path=usr/share/man/man3/HWLOC_DISTANCES_TRANSFORM_LINKS.3
+file path=usr/share/man/man3/HWLOC_DISTANCES_TRANSFORM_MERGE_SWITCH_PORTS.3
+file path=usr/share/man/man3/HWLOC_DISTANCES_TRANSFORM_REMOVE_NULL.3
+file path=usr/share/man/man3/HWLOC_DISTANCES_TRANSFORM_TRANSITIVE_CLOSURE.3
 file path=usr/share/man/man3/HWLOC_DISTRIB_FLAG_REVERSE.3
+file path=usr/share/man/man3/HWLOC_LOCAL_NUMANODE_FLAG_ALL.3
+file path=usr/share/man/man3/HWLOC_LOCAL_NUMANODE_FLAG_LARGER_LOCALITY.3
+file path=usr/share/man/man3/HWLOC_LOCAL_NUMANODE_FLAG_SMALLER_LOCALITY.3
+file path=usr/share/man/man3/HWLOC_LOCATION_TYPE_CPUSET.3
+file path=usr/share/man/man3/HWLOC_LOCATION_TYPE_OBJECT.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_FLAG_HIGHER_FIRST.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_FLAG_LOWER_FIRST.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_FLAG_NEED_INITIATOR.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_ID_BANDWIDTH.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_ID_CAPACITY.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_ID_LATENCY.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_ID_LOCALITY.3
 file path=usr/share/man/man3/HWLOC_MEMBIND_BIND.3
 file path=usr/share/man/man3/HWLOC_MEMBIND_BYNODESET.3
 file path=usr/share/man/man3/HWLOC_MEMBIND_DEFAULT.3
@@ -151,16 +166,23 @@
 file path=usr/share/man/man3/HWLOC_OBJ_PU.3
 file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_ADAPT_IO.3
 file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_ADAPT_MISC.3
+file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_BYNODESET.3
 file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_REMOVE_CPULESS.3
+file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_REMOVE_MEMLESS.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_COMPONENTS_FLAG_BLACKLIST.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_APPLY_REVERSE.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_NAME.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_SIZE.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_IMPORT_SUPPORT.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_INCLUDE_DISALLOWED.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_MEMBINDING.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES.3
-file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM.3
 file path=usr/share/man/man3/HWLOC_TYPE_DEPTH_BRIDGE.3
 file path=usr/share/man/man3/HWLOC_TYPE_DEPTH_MULTIPLE.3
 file path=usr/share/man/man3/HWLOC_TYPE_DEPTH_OS_DEVICE.3
@@ -174,6 +196,7 @@
 file path=usr/share/man/man3/hwloc_alloc.3
 file path=usr/share/man/man3/hwloc_alloc_membind.3
 file path=usr/share/man/man3/hwloc_alloc_membind_policy.3
+file path=usr/share/man/man3/hwloc_allow_flags_e.3
 file path=usr/share/man/man3/hwloc_bitmap_allbut.3
 file path=usr/share/man/man3/hwloc_bitmap_alloc.3
 file path=usr/share/man/man3/hwloc_bitmap_alloc_full.3
@@ -193,6 +216,7 @@
 file path=usr/share/man/man3/hwloc_bitmap_free.3
 file path=usr/share/man/man3/hwloc_bitmap_from_ith_ulong.3
 file path=usr/share/man/man3/hwloc_bitmap_from_ulong.3
+file path=usr/share/man/man3/hwloc_bitmap_from_ulongs.3
 file path=usr/share/man/man3/hwloc_bitmap_intersects.3
 file path=usr/share/man/man3/hwloc_bitmap_isequal.3
 file path=usr/share/man/man3/hwloc_bitmap_isfull.3
@@ -205,12 +229,14 @@
 file path=usr/share/man/man3/hwloc_bitmap_list_sscanf.3
 file path=usr/share/man/man3/hwloc_bitmap_next.3
 file path=usr/share/man/man3/hwloc_bitmap_not.3
+file path=usr/share/man/man3/hwloc_bitmap_nr_ulongs.3
 file path=usr/share/man/man3/hwloc_bitmap_only.3
 file path=usr/share/man/man3/hwloc_bitmap_or.3
 file path=usr/share/man/man3/hwloc_bitmap_set.3
 file path=usr/share/man/man3/hwloc_bitmap_set_ith_ulong.3
 file path=usr/share/man/man3/hwloc_bitmap_set_range.3
 file path=usr/share/man/man3/hwloc_bitmap_singlify.3
+file path=usr/share/man/man3/hwloc_bitmap_singlify_per_core.3
 file path=usr/share/man/man3/hwloc_bitmap_snprintf.3
 file path=usr/share/man/man3/hwloc_bitmap_sscanf.3
 file path=usr/share/man/man3/hwloc_bitmap_t.3
@@ -219,16 +245,20 @@
 file path=usr/share/man/man3/hwloc_bitmap_taskset_sscanf.3
 file path=usr/share/man/man3/hwloc_bitmap_to_ith_ulong.3
 file path=usr/share/man/man3/hwloc_bitmap_to_ulong.3
+file path=usr/share/man/man3/hwloc_bitmap_to_ulongs.3
 file path=usr/share/man/man3/hwloc_bitmap_weight.3
 file path=usr/share/man/man3/hwloc_bitmap_xor.3
 file path=usr/share/man/man3/hwloc_bitmap_zero.3
 file path=usr/share/man/man3/hwloc_bridge_covers_pcibus.3
 file path=usr/share/man/man3/hwloc_compare_types.3
-file path=usr/share/man/man3/hwloc_compare_types_e.3
 file path=usr/share/man/man3/hwloc_const_bitmap_t.3
 file path=usr/share/man/man3/hwloc_const_cpuset_t.3
 file path=usr/share/man/man3/hwloc_const_nodeset_t.3
 file path=usr/share/man/man3/hwloc_cpubind_flags_t.3
+file path=usr/share/man/man3/hwloc_cpukinds_get_by_cpuset.3
+file path=usr/share/man/man3/hwloc_cpukinds_get_info.3
+file path=usr/share/man/man3/hwloc_cpukinds_get_nr.3
+file path=usr/share/man/man3/hwloc_cpukinds_register.3
 file path=usr/share/man/man3/hwloc_cpuset_from_glibc_sched_affinity.3
 file path=usr/share/man/man3/hwloc_cpuset_from_linux_libnuma_bitmask.3
 file path=usr/share/man/man3/hwloc_cpuset_from_linux_libnuma_ulongs.3
@@ -247,19 +277,27 @@
 file path=usr/share/man/man3/hwloc_cudart_get_device_osdev_by_index.3
 file path=usr/share/man/man3/hwloc_cudart_get_device_pci_ids.3
 file path=usr/share/man/man3/hwloc_cudart_get_device_pcidev.3
-file path=usr/share/man/man3/hwloc_distances_add.3
+file path=usr/share/man/man3/hwloc_distances_add_commit.3
+file path=usr/share/man/man3/hwloc_distances_add_create.3
 file path=usr/share/man/man3/hwloc_distances_add_flag_e.3
+file path=usr/share/man/man3/hwloc_distances_add_handle_t.3
+file path=usr/share/man/man3/hwloc_distances_add_values.3
 file path=usr/share/man/man3/hwloc_distances_get.3
 file path=usr/share/man/man3/hwloc_distances_get_by_depth.3
+file path=usr/share/man/man3/hwloc_distances_get_by_name.3
 file path=usr/share/man/man3/hwloc_distances_get_by_type.3
+file path=usr/share/man/man3/hwloc_distances_get_name.3
 file path=usr/share/man/man3/hwloc_distances_kind_e.3
 file path=usr/share/man/man3/hwloc_distances_obj_index.3
 file path=usr/share/man/man3/hwloc_distances_obj_pair_values.3
 file path=usr/share/man/man3/hwloc_distances_release.3
+file path=usr/share/man/man3/hwloc_distances_release_remove.3
 file path=usr/share/man/man3/hwloc_distances_remove.3
 file path=usr/share/man/man3/hwloc_distances_remove_by_depth.3
 file path=usr/share/man/man3/hwloc_distances_remove_by_type.3
 file path=usr/share/man/man3/hwloc_distances_s.3
+file path=usr/share/man/man3/hwloc_distances_transform.3
+file path=usr/share/man/man3/hwloc_distances_transform_e.3
 file path=usr/share/man/man3/hwloc_distrib.3
 file path=usr/share/man/man3/hwloc_distrib_flags_e.3
 file path=usr/share/man/man3/hwloc_export_obj_userdata.3
@@ -281,6 +319,7 @@
 file path=usr/share/man/man3/hwloc_get_first_largest_obj_inside_cpuset.3
 file path=usr/share/man/man3/hwloc_get_largest_objs_inside_cpuset.3
 file path=usr/share/man/man3/hwloc_get_last_cpu_location.3
+file path=usr/share/man/man3/hwloc_get_local_numanode_objs.3
 file path=usr/share/man/man3/hwloc_get_membind.3
 file path=usr/share/man/man3/hwloc_get_memory_parents_depth.3
 file path=usr/share/man/man3/hwloc_get_nbobjs_by_depth.3
@@ -326,12 +365,28 @@
 file path=usr/share/man/man3/hwloc_ibv_get_device_osdev.3
 file path=usr/share/man/man3/hwloc_ibv_get_device_osdev_by_name.3
 file path=usr/share/man/man3/hwloc_info_s.3
-file path=usr/share/man/man3/hwloc_intel_mic_get_device_cpuset.3
-file path=usr/share/man/man3/hwloc_intel_mic_get_device_osdev_by_index.3
+file path=usr/share/man/man3/hwloc_levelzero_get_device_cpuset.3
+file path=usr/share/man/man3/hwloc_levelzero_get_device_osdev.3
 file path=usr/share/man/man3/hwloc_linux_get_tid_cpubind.3
 file path=usr/share/man/man3/hwloc_linux_get_tid_last_cpu_location.3
 file path=usr/share/man/man3/hwloc_linux_read_path_as_cpumask.3
 file path=usr/share/man/man3/hwloc_linux_set_tid_cpubind.3
+file path=usr/share/man/man3/hwloc_local_numanode_flag_e.3
+file path=usr/share/man/man3/hwloc_location.3
+file path=usr/share/man/man3/hwloc_location_type_e.3
+file path=usr/share/man/man3/hwloc_memattr_flag_e.3
+file path=usr/share/man/man3/hwloc_memattr_get_best_initiator.3
+file path=usr/share/man/man3/hwloc_memattr_get_best_target.3
+file path=usr/share/man/man3/hwloc_memattr_get_by_name.3
+file path=usr/share/man/man3/hwloc_memattr_get_flags.3
+file path=usr/share/man/man3/hwloc_memattr_get_initiators.3
+file path=usr/share/man/man3/hwloc_memattr_get_name.3
+file path=usr/share/man/man3/hwloc_memattr_get_targets.3
+file path=usr/share/man/man3/hwloc_memattr_get_value.3
+file path=usr/share/man/man3/hwloc_memattr_id_e.3
+file path=usr/share/man/man3/hwloc_memattr_id_t.3
+file path=usr/share/man/man3/hwloc_memattr_register.3
+file path=usr/share/man/man3/hwloc_memattr_set_value.3
 file path=usr/share/man/man3/hwloc_membind_flags_t.3
 file path=usr/share/man/man3/hwloc_membind_policy_t.3
 file path=usr/share/man/man3/hwloc_nodeset_from_linux_libnuma_bitmask.3
@@ -375,7 +430,11 @@
 file path=usr/share/man/man3/hwloc_opencl_get_device_cpuset.3
 file path=usr/share/man/man3/hwloc_opencl_get_device_osdev.3
 file path=usr/share/man/man3/hwloc_opencl_get_device_osdev_by_index.3
+file path=usr/share/man/man3/hwloc_opencl_get_device_pci_busid.3
 file path=usr/share/man/man3/hwloc_restrict_flags_e.3
+file path=usr/share/man/man3/hwloc_rsmi_get_device_cpuset.3
+file path=usr/share/man/man3/hwloc_rsmi_get_device_osdev.3
+file path=usr/share/man/man3/hwloc_rsmi_get_device_osdev_by_index.3
 file path=usr/share/man/man3/hwloc_set_area_membind.3
 file path=usr/share/man/man3/hwloc_set_cpubind.3
 file path=usr/share/man/man3/hwloc_set_membind.3
@@ -387,7 +446,9 @@
 file path=usr/share/man/man3/hwloc_shmem_topology_write.3
 file path=usr/share/man/man3/hwloc_topology_abi_check.3
 file path=usr/share/man/man3/hwloc_topology_alloc_group_object.3
+file path=usr/share/man/man3/hwloc_topology_allow.3
 file path=usr/share/man/man3/hwloc_topology_check.3
+file path=usr/share/man/man3/hwloc_topology_components_flag_e.3
 file path=usr/share/man/man3/hwloc_topology_cpubind_support.3
 file path=usr/share/man/man3/hwloc_topology_destroy.3
 file path=usr/share/man/man3/hwloc_topology_diff_apply.3
@@ -424,9 +485,12 @@
 file path=usr/share/man/man3/hwloc_topology_is_thissystem.3
 file path=usr/share/man/man3/hwloc_topology_load.3
 file path=usr/share/man/man3/hwloc_topology_membind_support.3
+file path=usr/share/man/man3/hwloc_topology_misc_support.3
+file path=usr/share/man/man3/hwloc_topology_refresh.3
 file path=usr/share/man/man3/hwloc_topology_restrict.3
 file path=usr/share/man/man3/hwloc_topology_set_all_types_filter.3
 file path=usr/share/man/man3/hwloc_topology_set_cache_types_filter.3
+file path=usr/share/man/man3/hwloc_topology_set_components.3
 file path=usr/share/man/man3/hwloc_topology_set_flags.3
 file path=usr/share/man/man3/hwloc_topology_set_icache_types_filter.3
 file path=usr/share/man/man3/hwloc_topology_set_io_types_filter.3
@@ -443,11 +507,14 @@
 file path=usr/share/man/man3/hwloc_type_filter_e.3
 file path=usr/share/man/man3/hwloc_type_sscanf.3
 file path=usr/share/man/man3/hwloc_type_sscanf_as_depth.3
+file path=usr/share/man/man3/hwloc_windows_get_nr_processor_groups.3
+file path=usr/share/man/man3/hwloc_windows_get_processor_group_cpuset.3
 file path=usr/share/man/man3/hwlocality_advanced_io.3
 file path=usr/share/man/man3/hwlocality_api_version.3
 file path=usr/share/man/man3/hwlocality_bitmap.3
 file path=usr/share/man/man3/hwlocality_configuration.3
 file path=usr/share/man/man3/hwlocality_cpubinding.3
+file path=usr/share/man/man3/hwlocality_cpukinds.3
 file path=usr/share/man/man3/hwlocality_creation.3
 file path=usr/share/man/man3/hwlocality_cuda.3
 file path=usr/share/man/man3/hwlocality_cudart.3
@@ -455,6 +522,7 @@
 file path=usr/share/man/man3/hwlocality_distances_add.3
 file path=usr/share/man/man3/hwlocality_distances_consult.3
 file path=usr/share/man/man3/hwlocality_distances_get.3
+file path=usr/share/man/man3/hwlocality_distances_remove.3
 file path=usr/share/man/man3/hwlocality_gl.3
 file path=usr/share/man/man3/hwlocality_glibc_sched.3
 file path=usr/share/man/man3/hwlocality_helper_ancestors.3
@@ -467,11 +535,13 @@
 file path=usr/share/man/man3/hwlocality_helper_topology_sets.3
 file path=usr/share/man/man3/hwlocality_helper_types.3
 file path=usr/share/man/man3/hwlocality_info_attr.3
-file path=usr/share/man/man3/hwlocality_intel_mic.3
 file path=usr/share/man/man3/hwlocality_levels.3
+file path=usr/share/man/man3/hwlocality_levelzero.3
 file path=usr/share/man/man3/hwlocality_linux.3
 file path=usr/share/man/man3/hwlocality_linux_libnuma_bitmask.3
 file path=usr/share/man/man3/hwlocality_linux_libnuma_ulongs.3
+file path=usr/share/man/man3/hwlocality_memattrs.3
+file path=usr/share/man/man3/hwlocality_memattrs_manage.3
 file path=usr/share/man/man3/hwlocality_membinding.3
 file path=usr/share/man/man3/hwlocality_nvml.3
 file path=usr/share/man/man3/hwlocality_object_sets.3
@@ -480,9 +550,11 @@
 file path=usr/share/man/man3/hwlocality_objects.3
 file path=usr/share/man/man3/hwlocality_opencl.3
 file path=usr/share/man/man3/hwlocality_openfabrics.3
+file path=usr/share/man/man3/hwlocality_rsmi.3
 file path=usr/share/man/man3/hwlocality_setsource.3
 file path=usr/share/man/man3/hwlocality_shmem.3
 file path=usr/share/man/man3/hwlocality_syntheticexport.3
 file path=usr/share/man/man3/hwlocality_tinker.3
+file path=usr/share/man/man3/hwlocality_windows.3
 file path=usr/share/man/man3/hwlocality_xmlexport.3
 file path=usr/share/man/man7/hwloc.7
diff --git a/components/developer/hwloc/manifests/sample-manifest.p5m b/components/developer/hwloc/manifests/sample-manifest.p5m
index 9ca8712..90ad540 100644
--- a/components/developer/hwloc/manifests/sample-manifest.p5m
+++ b/components/developer/hwloc/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
 #
 
 #
-# Copyright 2017 <contributor>
+# Copyright 2023 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="$(COMPONENT_SUMMARY)"
 set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,19 +23,6 @@
 
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
-file path=usr/bin/$(MACH32)/hwloc-annotate
-file path=usr/bin/$(MACH32)/hwloc-bind
-file path=usr/bin/$(MACH32)/hwloc-calc
-file path=usr/bin/$(MACH32)/hwloc-compress-dir
-file path=usr/bin/$(MACH32)/hwloc-diff
-file path=usr/bin/$(MACH32)/hwloc-distrib
-file path=usr/bin/$(MACH32)/hwloc-gather-cpuid
-file path=usr/bin/$(MACH32)/hwloc-info
-link path=usr/bin/$(MACH32)/hwloc-ls target=lstopo-no-graphics
-file path=usr/bin/$(MACH32)/hwloc-patch
-file path=usr/bin/$(MACH32)/hwloc-ps
-file path=usr/bin/$(MACH32)/lstopo
-file path=usr/bin/$(MACH32)/lstopo-no-graphics
 file path=usr/bin/hwloc-annotate
 file path=usr/bin/hwloc-bind
 file path=usr/bin/hwloc-calc
@@ -51,6 +39,7 @@
 file path=usr/include/hwloc.h
 file path=usr/include/hwloc/autogen/config.h
 file path=usr/include/hwloc/bitmap.h
+file path=usr/include/hwloc/cpukinds.h
 file path=usr/include/hwloc/cuda.h
 file path=usr/include/hwloc/cudart.h
 file path=usr/include/hwloc/deprecated.h
@@ -60,25 +49,32 @@
 file path=usr/include/hwloc/gl.h
 file path=usr/include/hwloc/helper.h
 file path=usr/include/hwloc/inlines.h
-file path=usr/include/hwloc/intel-mic.h
+file path=usr/include/hwloc/levelzero.h
+file path=usr/include/hwloc/memattrs.h
 file path=usr/include/hwloc/nvml.h
 file path=usr/include/hwloc/opencl.h
 file path=usr/include/hwloc/openfabrics-verbs.h
 file path=usr/include/hwloc/plugins.h
 file path=usr/include/hwloc/rename.h
+file path=usr/include/hwloc/rsmi.h
 file path=usr/include/hwloc/shmem.h
 file path=usr/include/hwloc/solaris-chiptype.h
-link path=usr/lib/$(MACH64)/libhwloc.so target=libhwloc.so.15.0.0
-link path=usr/lib/$(MACH64)/libhwloc.so.15 target=libhwloc.so.15.0.0
-file path=usr/lib/$(MACH64)/libhwloc.so.15.0.0
+link path=usr/lib/$(MACH64)/libhwloc.so target=libhwloc.so.15.6.0
+link path=usr/lib/$(MACH64)/libhwloc.so.15 target=libhwloc.so.15.6.0
+file path=usr/lib/$(MACH64)/libhwloc.so.15.6.0
 file path=usr/lib/$(MACH64)/pkgconfig/hwloc.pc
-link path=usr/lib/libhwloc.so target=libhwloc.so.15.0.0
-link path=usr/lib/libhwloc.so.15 target=libhwloc.so.15.0.0
-file path=usr/lib/libhwloc.so.15.0.0
-file path=usr/lib/pkgconfig/hwloc.pc
 file path=usr/share/applications/lstopo.desktop
+file path=usr/share/bash-completion/completions/hwloc
+file path=usr/share/doc/hwloc/dynamic_SVG_example.html
 file path=usr/share/doc/hwloc/hwloc-a4.pdf
 file path=usr/share/doc/hwloc/hwloc-letter.pdf
+file path=usr/share/hwloc/hwloc-ps.www/README
+file path=usr/share/hwloc/hwloc-ps.www/assets/index.html
+file path=usr/share/hwloc/hwloc-ps.www/assets/main.css
+file path=usr/share/hwloc/hwloc-ps.www/assets/script.js
+file path=usr/share/hwloc/hwloc-ps.www/assets/style.css
+file path=usr/share/hwloc/hwloc-ps.www/client.js
+file path=usr/share/hwloc/hwloc-ps.www/package.json
 file path=usr/share/hwloc/hwloc-valgrind.supp
 file path=usr/share/hwloc/hwloc.dtd
 file path=usr/share/hwloc/hwloc2-diff.dtd
@@ -96,6 +92,9 @@
 file path=usr/share/man/man1/hwloc-ps.1
 file path=usr/share/man/man1/lstopo-no-graphics.1
 link path=usr/share/man/man1/lstopo.1 target=lstopo-no-graphics.1
+file path=usr/share/man/man3/HWLOC_ALLOW_FLAG_ALL.3
+file path=usr/share/man/man3/HWLOC_ALLOW_FLAG_CUSTOM.3
+file path=usr/share/man/man3/HWLOC_ALLOW_FLAG_LOCAL_RESTRICTIONS.3
 file path=usr/share/man/man3/HWLOC_API_VERSION.3
 file path=usr/share/man/man3/HWLOC_CPUBIND_NOMEMBIND.3
 file path=usr/share/man/man3/HWLOC_CPUBIND_PROCESS.3
@@ -107,7 +106,23 @@
 file path=usr/share/man/man3/HWLOC_DISTANCES_KIND_FROM_USER.3
 file path=usr/share/man/man3/HWLOC_DISTANCES_KIND_MEANS_BANDWIDTH.3
 file path=usr/share/man/man3/HWLOC_DISTANCES_KIND_MEANS_LATENCY.3
+file path=usr/share/man/man3/HWLOC_DISTANCES_TRANSFORM_LINKS.3
+file path=usr/share/man/man3/HWLOC_DISTANCES_TRANSFORM_MERGE_SWITCH_PORTS.3
+file path=usr/share/man/man3/HWLOC_DISTANCES_TRANSFORM_REMOVE_NULL.3
+file path=usr/share/man/man3/HWLOC_DISTANCES_TRANSFORM_TRANSITIVE_CLOSURE.3
 file path=usr/share/man/man3/HWLOC_DISTRIB_FLAG_REVERSE.3
+file path=usr/share/man/man3/HWLOC_LOCAL_NUMANODE_FLAG_ALL.3
+file path=usr/share/man/man3/HWLOC_LOCAL_NUMANODE_FLAG_LARGER_LOCALITY.3
+file path=usr/share/man/man3/HWLOC_LOCAL_NUMANODE_FLAG_SMALLER_LOCALITY.3
+file path=usr/share/man/man3/HWLOC_LOCATION_TYPE_CPUSET.3
+file path=usr/share/man/man3/HWLOC_LOCATION_TYPE_OBJECT.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_FLAG_HIGHER_FIRST.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_FLAG_LOWER_FIRST.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_FLAG_NEED_INITIATOR.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_ID_BANDWIDTH.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_ID_CAPACITY.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_ID_LATENCY.3
+file path=usr/share/man/man3/HWLOC_MEMATTR_ID_LOCALITY.3
 file path=usr/share/man/man3/HWLOC_MEMBIND_BIND.3
 file path=usr/share/man/man3/HWLOC_MEMBIND_BYNODESET.3
 file path=usr/share/man/man3/HWLOC_MEMBIND_DEFAULT.3
@@ -151,16 +166,23 @@
 file path=usr/share/man/man3/HWLOC_OBJ_PU.3
 file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_ADAPT_IO.3
 file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_ADAPT_MISC.3
+file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_BYNODESET.3
 file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_REMOVE_CPULESS.3
+file path=usr/share/man/man3/HWLOC_RESTRICT_FLAG_REMOVE_MEMLESS.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_COMPONENTS_FLAG_BLACKLIST.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_APPLY_REVERSE.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_NAME.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_SIZE.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_IMPORT_SUPPORT.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_INCLUDE_DISALLOWED.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING.3
+file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_MEMBINDING.3
 file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES.3
-file path=usr/share/man/man3/HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM.3
 file path=usr/share/man/man3/HWLOC_TYPE_DEPTH_BRIDGE.3
 file path=usr/share/man/man3/HWLOC_TYPE_DEPTH_MULTIPLE.3
 file path=usr/share/man/man3/HWLOC_TYPE_DEPTH_OS_DEVICE.3
@@ -174,6 +196,7 @@
 file path=usr/share/man/man3/hwloc_alloc.3
 file path=usr/share/man/man3/hwloc_alloc_membind.3
 file path=usr/share/man/man3/hwloc_alloc_membind_policy.3
+file path=usr/share/man/man3/hwloc_allow_flags_e.3
 file path=usr/share/man/man3/hwloc_bitmap_allbut.3
 file path=usr/share/man/man3/hwloc_bitmap_alloc.3
 file path=usr/share/man/man3/hwloc_bitmap_alloc_full.3
@@ -193,6 +216,7 @@
 file path=usr/share/man/man3/hwloc_bitmap_free.3
 file path=usr/share/man/man3/hwloc_bitmap_from_ith_ulong.3
 file path=usr/share/man/man3/hwloc_bitmap_from_ulong.3
+file path=usr/share/man/man3/hwloc_bitmap_from_ulongs.3
 file path=usr/share/man/man3/hwloc_bitmap_intersects.3
 file path=usr/share/man/man3/hwloc_bitmap_isequal.3
 file path=usr/share/man/man3/hwloc_bitmap_isfull.3
@@ -205,12 +229,14 @@
 file path=usr/share/man/man3/hwloc_bitmap_list_sscanf.3
 file path=usr/share/man/man3/hwloc_bitmap_next.3
 file path=usr/share/man/man3/hwloc_bitmap_not.3
+file path=usr/share/man/man3/hwloc_bitmap_nr_ulongs.3
 file path=usr/share/man/man3/hwloc_bitmap_only.3
 file path=usr/share/man/man3/hwloc_bitmap_or.3
 file path=usr/share/man/man3/hwloc_bitmap_set.3
 file path=usr/share/man/man3/hwloc_bitmap_set_ith_ulong.3
 file path=usr/share/man/man3/hwloc_bitmap_set_range.3
 file path=usr/share/man/man3/hwloc_bitmap_singlify.3
+file path=usr/share/man/man3/hwloc_bitmap_singlify_per_core.3
 file path=usr/share/man/man3/hwloc_bitmap_snprintf.3
 file path=usr/share/man/man3/hwloc_bitmap_sscanf.3
 file path=usr/share/man/man3/hwloc_bitmap_t.3
@@ -219,16 +245,20 @@
 file path=usr/share/man/man3/hwloc_bitmap_taskset_sscanf.3
 file path=usr/share/man/man3/hwloc_bitmap_to_ith_ulong.3
 file path=usr/share/man/man3/hwloc_bitmap_to_ulong.3
+file path=usr/share/man/man3/hwloc_bitmap_to_ulongs.3
 file path=usr/share/man/man3/hwloc_bitmap_weight.3
 file path=usr/share/man/man3/hwloc_bitmap_xor.3
 file path=usr/share/man/man3/hwloc_bitmap_zero.3
 file path=usr/share/man/man3/hwloc_bridge_covers_pcibus.3
 file path=usr/share/man/man3/hwloc_compare_types.3
-file path=usr/share/man/man3/hwloc_compare_types_e.3
 file path=usr/share/man/man3/hwloc_const_bitmap_t.3
 file path=usr/share/man/man3/hwloc_const_cpuset_t.3
 file path=usr/share/man/man3/hwloc_const_nodeset_t.3
 file path=usr/share/man/man3/hwloc_cpubind_flags_t.3
+file path=usr/share/man/man3/hwloc_cpukinds_get_by_cpuset.3
+file path=usr/share/man/man3/hwloc_cpukinds_get_info.3
+file path=usr/share/man/man3/hwloc_cpukinds_get_nr.3
+file path=usr/share/man/man3/hwloc_cpukinds_register.3
 file path=usr/share/man/man3/hwloc_cpuset_from_glibc_sched_affinity.3
 file path=usr/share/man/man3/hwloc_cpuset_from_linux_libnuma_bitmask.3
 file path=usr/share/man/man3/hwloc_cpuset_from_linux_libnuma_ulongs.3
@@ -247,19 +277,27 @@
 file path=usr/share/man/man3/hwloc_cudart_get_device_osdev_by_index.3
 file path=usr/share/man/man3/hwloc_cudart_get_device_pci_ids.3
 file path=usr/share/man/man3/hwloc_cudart_get_device_pcidev.3
-file path=usr/share/man/man3/hwloc_distances_add.3
+file path=usr/share/man/man3/hwloc_distances_add_commit.3
+file path=usr/share/man/man3/hwloc_distances_add_create.3
 file path=usr/share/man/man3/hwloc_distances_add_flag_e.3
+file path=usr/share/man/man3/hwloc_distances_add_handle_t.3
+file path=usr/share/man/man3/hwloc_distances_add_values.3
 file path=usr/share/man/man3/hwloc_distances_get.3
 file path=usr/share/man/man3/hwloc_distances_get_by_depth.3
+file path=usr/share/man/man3/hwloc_distances_get_by_name.3
 file path=usr/share/man/man3/hwloc_distances_get_by_type.3
+file path=usr/share/man/man3/hwloc_distances_get_name.3
 file path=usr/share/man/man3/hwloc_distances_kind_e.3
 file path=usr/share/man/man3/hwloc_distances_obj_index.3
 file path=usr/share/man/man3/hwloc_distances_obj_pair_values.3
 file path=usr/share/man/man3/hwloc_distances_release.3
+file path=usr/share/man/man3/hwloc_distances_release_remove.3
 file path=usr/share/man/man3/hwloc_distances_remove.3
 file path=usr/share/man/man3/hwloc_distances_remove_by_depth.3
 file path=usr/share/man/man3/hwloc_distances_remove_by_type.3
 file path=usr/share/man/man3/hwloc_distances_s.3
+file path=usr/share/man/man3/hwloc_distances_transform.3
+file path=usr/share/man/man3/hwloc_distances_transform_e.3
 file path=usr/share/man/man3/hwloc_distrib.3
 file path=usr/share/man/man3/hwloc_distrib_flags_e.3
 file path=usr/share/man/man3/hwloc_export_obj_userdata.3
@@ -281,6 +319,7 @@
 file path=usr/share/man/man3/hwloc_get_first_largest_obj_inside_cpuset.3
 file path=usr/share/man/man3/hwloc_get_largest_objs_inside_cpuset.3
 file path=usr/share/man/man3/hwloc_get_last_cpu_location.3
+file path=usr/share/man/man3/hwloc_get_local_numanode_objs.3
 file path=usr/share/man/man3/hwloc_get_membind.3
 file path=usr/share/man/man3/hwloc_get_memory_parents_depth.3
 file path=usr/share/man/man3/hwloc_get_nbobjs_by_depth.3
@@ -326,12 +365,28 @@
 file path=usr/share/man/man3/hwloc_ibv_get_device_osdev.3
 file path=usr/share/man/man3/hwloc_ibv_get_device_osdev_by_name.3
 file path=usr/share/man/man3/hwloc_info_s.3
-file path=usr/share/man/man3/hwloc_intel_mic_get_device_cpuset.3
-file path=usr/share/man/man3/hwloc_intel_mic_get_device_osdev_by_index.3
+file path=usr/share/man/man3/hwloc_levelzero_get_device_cpuset.3
+file path=usr/share/man/man3/hwloc_levelzero_get_device_osdev.3
 file path=usr/share/man/man3/hwloc_linux_get_tid_cpubind.3
 file path=usr/share/man/man3/hwloc_linux_get_tid_last_cpu_location.3
 file path=usr/share/man/man3/hwloc_linux_read_path_as_cpumask.3
 file path=usr/share/man/man3/hwloc_linux_set_tid_cpubind.3
+file path=usr/share/man/man3/hwloc_local_numanode_flag_e.3
+file path=usr/share/man/man3/hwloc_location.3
+file path=usr/share/man/man3/hwloc_location_type_e.3
+file path=usr/share/man/man3/hwloc_memattr_flag_e.3
+file path=usr/share/man/man3/hwloc_memattr_get_best_initiator.3
+file path=usr/share/man/man3/hwloc_memattr_get_best_target.3
+file path=usr/share/man/man3/hwloc_memattr_get_by_name.3
+file path=usr/share/man/man3/hwloc_memattr_get_flags.3
+file path=usr/share/man/man3/hwloc_memattr_get_initiators.3
+file path=usr/share/man/man3/hwloc_memattr_get_name.3
+file path=usr/share/man/man3/hwloc_memattr_get_targets.3
+file path=usr/share/man/man3/hwloc_memattr_get_value.3
+file path=usr/share/man/man3/hwloc_memattr_id_e.3
+file path=usr/share/man/man3/hwloc_memattr_id_t.3
+file path=usr/share/man/man3/hwloc_memattr_register.3
+file path=usr/share/man/man3/hwloc_memattr_set_value.3
 file path=usr/share/man/man3/hwloc_membind_flags_t.3
 file path=usr/share/man/man3/hwloc_membind_policy_t.3
 file path=usr/share/man/man3/hwloc_nodeset_from_linux_libnuma_bitmask.3
@@ -375,7 +430,11 @@
 file path=usr/share/man/man3/hwloc_opencl_get_device_cpuset.3
 file path=usr/share/man/man3/hwloc_opencl_get_device_osdev.3
 file path=usr/share/man/man3/hwloc_opencl_get_device_osdev_by_index.3
+file path=usr/share/man/man3/hwloc_opencl_get_device_pci_busid.3
 file path=usr/share/man/man3/hwloc_restrict_flags_e.3
+file path=usr/share/man/man3/hwloc_rsmi_get_device_cpuset.3
+file path=usr/share/man/man3/hwloc_rsmi_get_device_osdev.3
+file path=usr/share/man/man3/hwloc_rsmi_get_device_osdev_by_index.3
 file path=usr/share/man/man3/hwloc_set_area_membind.3
 file path=usr/share/man/man3/hwloc_set_cpubind.3
 file path=usr/share/man/man3/hwloc_set_membind.3
@@ -387,7 +446,9 @@
 file path=usr/share/man/man3/hwloc_shmem_topology_write.3
 file path=usr/share/man/man3/hwloc_topology_abi_check.3
 file path=usr/share/man/man3/hwloc_topology_alloc_group_object.3
+file path=usr/share/man/man3/hwloc_topology_allow.3
 file path=usr/share/man/man3/hwloc_topology_check.3
+file path=usr/share/man/man3/hwloc_topology_components_flag_e.3
 file path=usr/share/man/man3/hwloc_topology_cpubind_support.3
 file path=usr/share/man/man3/hwloc_topology_destroy.3
 file path=usr/share/man/man3/hwloc_topology_diff_apply.3
@@ -424,9 +485,12 @@
 file path=usr/share/man/man3/hwloc_topology_is_thissystem.3
 file path=usr/share/man/man3/hwloc_topology_load.3
 file path=usr/share/man/man3/hwloc_topology_membind_support.3
+file path=usr/share/man/man3/hwloc_topology_misc_support.3
+file path=usr/share/man/man3/hwloc_topology_refresh.3
 file path=usr/share/man/man3/hwloc_topology_restrict.3
 file path=usr/share/man/man3/hwloc_topology_set_all_types_filter.3
 file path=usr/share/man/man3/hwloc_topology_set_cache_types_filter.3
+file path=usr/share/man/man3/hwloc_topology_set_components.3
 file path=usr/share/man/man3/hwloc_topology_set_flags.3
 file path=usr/share/man/man3/hwloc_topology_set_icache_types_filter.3
 file path=usr/share/man/man3/hwloc_topology_set_io_types_filter.3
@@ -443,11 +507,14 @@
 file path=usr/share/man/man3/hwloc_type_filter_e.3
 file path=usr/share/man/man3/hwloc_type_sscanf.3
 file path=usr/share/man/man3/hwloc_type_sscanf_as_depth.3
+file path=usr/share/man/man3/hwloc_windows_get_nr_processor_groups.3
+file path=usr/share/man/man3/hwloc_windows_get_processor_group_cpuset.3
 file path=usr/share/man/man3/hwlocality_advanced_io.3
 file path=usr/share/man/man3/hwlocality_api_version.3
 file path=usr/share/man/man3/hwlocality_bitmap.3
 file path=usr/share/man/man3/hwlocality_configuration.3
 file path=usr/share/man/man3/hwlocality_cpubinding.3
+file path=usr/share/man/man3/hwlocality_cpukinds.3
 file path=usr/share/man/man3/hwlocality_creation.3
 file path=usr/share/man/man3/hwlocality_cuda.3
 file path=usr/share/man/man3/hwlocality_cudart.3
@@ -455,6 +522,7 @@
 file path=usr/share/man/man3/hwlocality_distances_add.3
 file path=usr/share/man/man3/hwlocality_distances_consult.3
 file path=usr/share/man/man3/hwlocality_distances_get.3
+file path=usr/share/man/man3/hwlocality_distances_remove.3
 file path=usr/share/man/man3/hwlocality_gl.3
 file path=usr/share/man/man3/hwlocality_glibc_sched.3
 file path=usr/share/man/man3/hwlocality_helper_ancestors.3
@@ -467,11 +535,13 @@
 file path=usr/share/man/man3/hwlocality_helper_topology_sets.3
 file path=usr/share/man/man3/hwlocality_helper_types.3
 file path=usr/share/man/man3/hwlocality_info_attr.3
-file path=usr/share/man/man3/hwlocality_intel_mic.3
 file path=usr/share/man/man3/hwlocality_levels.3
+file path=usr/share/man/man3/hwlocality_levelzero.3
 file path=usr/share/man/man3/hwlocality_linux.3
 file path=usr/share/man/man3/hwlocality_linux_libnuma_bitmask.3
 file path=usr/share/man/man3/hwlocality_linux_libnuma_ulongs.3
+file path=usr/share/man/man3/hwlocality_memattrs.3
+file path=usr/share/man/man3/hwlocality_memattrs_manage.3
 file path=usr/share/man/man3/hwlocality_membinding.3
 file path=usr/share/man/man3/hwlocality_nvml.3
 file path=usr/share/man/man3/hwlocality_object_sets.3
@@ -480,9 +550,11 @@
 file path=usr/share/man/man3/hwlocality_objects.3
 file path=usr/share/man/man3/hwlocality_opencl.3
 file path=usr/share/man/man3/hwlocality_openfabrics.3
+file path=usr/share/man/man3/hwlocality_rsmi.3
 file path=usr/share/man/man3/hwlocality_setsource.3
 file path=usr/share/man/man3/hwlocality_shmem.3
 file path=usr/share/man/man3/hwlocality_syntheticexport.3
 file path=usr/share/man/man3/hwlocality_tinker.3
+file path=usr/share/man/man3/hwlocality_windows.3
 file path=usr/share/man/man3/hwlocality_xmlexport.3
 file path=usr/share/man/man7/hwloc.7
diff --git a/components/developer/hwloc/pkg5 b/components/developer/hwloc/pkg5
index 9fbc9a2..ce4e112 100644
--- a/components/developer/hwloc/pkg5
+++ b/components/developer/hwloc/pkg5
@@ -1,10 +1,10 @@
 {
     "dependencies": [
-        "SUNWcs",
         "diagnostic/scanpci",
         "library/desktop/cairo",
         "library/libxml2",
         "service/picl",
+        "shell/ksh93",
         "system/header/header-picl",
         "system/library",
         "system/library/math",
diff --git a/components/developer/hwloc/test/results-64.master b/components/developer/hwloc/test/results-64.master
deleted file mode 100644
index 7760e51..0000000
--- a/components/developer/hwloc/test/results-64.master
+++ /dev/null
@@ -1,138 +0,0 @@
-PASS: test-hwloc-annotate.sh
-PASS: test-hwloc-calc.sh
-PASS: test-hwloc-compress-dir.sh
-PASS: test-hwloc-diffpatch.sh
-PASS: test-hwloc-distrib.sh
-PASS: test-hwloc-info.sh
-# TOTAL: 6
-# PASS:  6
-# SKIP:  0
-# XFAIL: 0
-# FAIL:  0
-# XPASS: 0
-# ERROR: 0
-PASS: test-lstopo.sh
-# TOTAL: 1
-# PASS:  1
-# SKIP:  0
-# XFAIL: 0
-# FAIL:  0
-# XPASS: 0
-# ERROR: 0
-PASS: hwloc_list_components
-PASS: hwloc_bitmap
-PASS: hwloc_bitmap_string
-PASS: hwloc_bitmap_compare_inclusion
-PASS: hwloc_get_closest_objs
-PASS: hwloc_get_obj_covering_cpuset
-PASS: hwloc_get_cache_covering_cpuset
-PASS: hwloc_get_largest_objs_inside_cpuset
-PASS: hwloc_get_next_obj_covering_cpuset
-PASS: hwloc_get_obj_inside_cpuset
-PASS: hwloc_get_shared_cache_covering_obj
-PASS: hwloc_get_obj_below_array_by_type
-PASS: hwloc_bitmap_first_last_weight
-PASS: hwloc_bitmap_singlify
-PASS: hwloc_type_depth
-PASS: hwloc_type_sscanf
-PASS: hwloc_bind
-PASS: hwloc_get_last_cpu_location
-PASS: hwloc_get_area_memlocation
-PASS: hwloc_object_userdata
-PASS: hwloc_synthetic
-PASS: hwloc_backends
-PASS: hwloc_pci_backend
-PASS: hwloc_is_thissystem
-PASS: hwloc_distances
-PASS: hwloc_groups
-PASS: hwloc_insert_misc
-PASS: hwloc_topology_restrict
-PASS: hwloc_topology_dup
-PASS: hwloc_topology_diff
-PASS: hwloc_topology_abi
-PASS: hwloc_obj_infos
-PASS: hwloc_iodevs
-PASS: xmlbuffer
-PASS: gl
-PASS: intel-mic
-PASS: shmem
-# TOTAL: 37
-# PASS:  37
-# SKIP:  0
-# XFAIL: 0
-# FAIL:  0
-# XPASS: 0
-# ERROR: 0
-PASS: 16amd64-8n2c-cpusets.xml
-PASS: 16amd64-4distances.xml
-PASS: 16amd64-4distances.console.output
-PASS: 16em64t-4s2c2t.xml
-PASS: 16em64t-4s2c2t-offlines.xml
-PASS: 16em64t-4s2c2t.console.output
-PASS: 16-2gr2gr2n2c+misc.xml
-PASS: 16-2gr2gr2n2c+misc.console.output
-PASS: 16intel64-manyVFs.xml
-PASS: 16intel64-manyVFs.console.output
-PASS: 16intel64-manyVFs.console.nocollapse.output
-PASS: 24em64t-2n6c2t-pci.xml
-PASS: 32em64t-2n8c2t-pci-noio.xml
-PASS: 32em64t-2n8c2t-pci-normalio.xml
-PASS: 32em64t-2n8c2t-pci-wholeio.xml
-PASS: 64intel64-3g2n+2n-irregulargroups+pci.xml
-PASS: 64intel64-3g2n+2n-irregulargroups+pci.console.output
-PASS: 64intel64-fakeKNL-SNC4-hybrid.xml
-PASS: 96em64t-4n4d3ca2co-pci.xml
-PASS: 192em64t-12gr2n8c2t.xml
-PASS: 192em64t-24n8c2t.xml
-PASS: 8em64t-2p2ca2co-nonodesets.v1tov2.xml
-PASS: 8ia64-2n2s2c+1n.v1tov2.xml
-PASS: 16amd64-4distances.v1tov2.xml
-PASS: 16amd64-4distances.v2tov1.xml
-PASS: 2intel64-1n2c-numaroot.v1tov2.xml
-PASS: 28intel64-2p2g7c-CoDgroups.v1tov2.xml
-PASS: 28intel64-2p2g7c-CoD.nogroups.v1tov2.xml
-PASS: 64intel64-fakeKNL-SNC4-hybrid.v1tov2.xml
-PASS: 64intel64-fakeKNL-SNC4-hybrid.v2tov1.xml
-# TOTAL: 30
-# PASS:  30
-# SKIP:  0
-# XFAIL: 0
-# FAIL:  0
-# XPASS: 0
-# ERROR: 0
-PASS: Intel-Skylake-2xXeon6140.output
-PASS: Intel-Broadwell-2xXeon-E5-2650Lv4.output
-PASS: Intel-Haswell-2xXeon-E5-2680v3.output
-PASS: Intel-IvyBridge-12xXeon-E5-4620v2.output
-PASS: Intel-SandyBridge-2xXeon-E5-2650.output
-PASS: Intel-Westmere-2xXeon-X5650.output
-PASS: Intel-Nehalem-2xXeon-X5550.output
-PASS: Intel-Penryn-4xXeon-X7460.output
-PASS: Intel-Core-2xXeon-E5345.output
-PASS: Intel-KnightsLanding-XeonPhi-7210.output
-PASS: Intel-KnightsCorner-XeonPhi-SE10P.output
-PASS: AMD-17h-Zen-2xEpyc-7451.output
-PASS: AMD-15h-Piledriver-4xOpteron-6348.output
-PASS: AMD-15h-Bulldozer-4xOpteron-6272.output
-PASS: AMD-K10-MagnyCours-2xOpteron-6164HE.output
-PASS: AMD-K10-Istanbul-8xOpteron-8439SE.output
-PASS: AMD-K8-SantaRosa-2xOpteron-2218.output
-PASS: AMD-K8-SledgeHammer-2xOpteron-250.output
-PASS: Zhaoxin-CentaurHauls-ZXD-4600.output
-PASS: Zhaoxin-Shanghai-KaiSheng-ZXC+-FC1081.output
-# TOTAL: 20
-# PASS:  20
-# SKIP:  0
-# XFAIL: 0
-# FAIL:  0
-# XPASS: 0
-# ERROR: 0
-PASS: hwloc-hello
-PASS: hwloc-hello-cpp
-# TOTAL: 2
-# PASS:  2
-# SKIP:  0
-# XFAIL: 0
-# FAIL:  0
-# XPASS: 0
-# ERROR: 0
diff --git a/components/developer/hwloc/test/results-32.master b/components/developer/hwloc/test/results-all.master
similarity index 82%
rename from components/developer/hwloc/test/results-32.master
rename to components/developer/hwloc/test/results-all.master
index 7760e51..11b587d 100644
--- a/components/developer/hwloc/test/results-32.master
+++ b/components/developer/hwloc/test/results-all.master
@@ -4,8 +4,10 @@
 PASS: test-hwloc-diffpatch.sh
 PASS: test-hwloc-distrib.sh
 PASS: test-hwloc-info.sh
-# TOTAL: 6
-# PASS:  6
+PASS: test-build-custom-topology.sh
+PASS: test-parsing-flags.sh
+# TOTAL: 8
+# PASS:  8
 # SKIP:  0
 # XFAIL: 0
 # FAIL:  0
@@ -19,6 +21,7 @@
 # FAIL:  0
 # XPASS: 0
 # ERROR: 0
+PASS: hwloc_api_version
 PASS: hwloc_list_components
 PASS: hwloc_bitmap
 PASS: hwloc_bitmap_string
@@ -31,6 +34,7 @@
 PASS: hwloc_get_obj_inside_cpuset
 PASS: hwloc_get_shared_cache_covering_obj
 PASS: hwloc_get_obj_below_array_by_type
+PASS: hwloc_get_obj_with_same_locality
 PASS: hwloc_bitmap_first_last_weight
 PASS: hwloc_bitmap_singlify
 PASS: hwloc_type_depth
@@ -46,23 +50,28 @@
 PASS: hwloc_distances
 PASS: hwloc_groups
 PASS: hwloc_insert_misc
+PASS: hwloc_topology_allow
 PASS: hwloc_topology_restrict
 PASS: hwloc_topology_dup
 PASS: hwloc_topology_diff
 PASS: hwloc_topology_abi
 PASS: hwloc_obj_infos
 PASS: hwloc_iodevs
+PASS: cpuset_nodeset
+PASS: memattrs
+PASS: memtiers
+PASS: cpukinds
 PASS: xmlbuffer
 PASS: gl
-PASS: intel-mic
 PASS: shmem
-# TOTAL: 37
-# PASS:  37
+# TOTAL: 43
+# PASS:  43
 # SKIP:  0
 # XFAIL: 0
 # FAIL:  0
 # XPASS: 0
 # ERROR: 0
+PASS: 8intel64-4n2t-memattrs.xml
 PASS: 16amd64-8n2c-cpusets.xml
 PASS: 16amd64-4distances.xml
 PASS: 16amd64-4distances.console.output
@@ -80,10 +89,14 @@
 PASS: 32em64t-2n8c2t-pci-wholeio.xml
 PASS: 64intel64-3g2n+2n-irregulargroups+pci.xml
 PASS: 64intel64-3g2n+2n-irregulargroups+pci.console.output
+PASS: 8intel64-fakeKNL-A2A-hybrid.rootattachednumas.xml
 PASS: 64intel64-fakeKNL-SNC4-hybrid.xml
 PASS: 96em64t-4n4d3ca2co-pci.xml
 PASS: 192em64t-12gr2n8c2t.xml
 PASS: 192em64t-24n8c2t.xml
+PASS: power8gpudistances.xml
+PASS: fakeheterodistances.xml
+PASS: fakecpukinds.xml
 PASS: 8em64t-2p2ca2co-nonodesets.v1tov2.xml
 PASS: 8ia64-2n2s2c+1n.v1tov2.xml
 PASS: 16amd64-4distances.v1tov2.xml
@@ -91,15 +104,20 @@
 PASS: 2intel64-1n2c-numaroot.v1tov2.xml
 PASS: 28intel64-2p2g7c-CoDgroups.v1tov2.xml
 PASS: 28intel64-2p2g7c-CoD.nogroups.v1tov2.xml
+PASS: 8intel64-fakeKNL-A2A-hybrid.rootattachednumas.v1tov2.xml
+PASS: 8intel64-fakeKNL-A2A-hybrid.rootattachednumas.v2tov1.xml
 PASS: 64intel64-fakeKNL-SNC4-hybrid.v1tov2.xml
 PASS: 64intel64-fakeKNL-SNC4-hybrid.v2tov1.xml
-# TOTAL: 30
-# PASS:  30
+# TOTAL: 37
+# PASS:  37
 # SKIP:  0
 # XFAIL: 0
 # FAIL:  0
 # XPASS: 0
 # ERROR: 0
+PASS: Intel-CPUID.1A-1p2co2t.output
+PASS: Intel-CPUID.1F-Qemu-2p3d3c2t.output
+PASS: Intel-CascadeLake-2xXeon6230.output
 PASS: Intel-Skylake-2xXeon6140.output
 PASS: Intel-Broadwell-2xXeon-E5-2650Lv4.output
 PASS: Intel-Haswell-2xXeon-E5-2680v3.output
@@ -111,6 +129,7 @@
 PASS: Intel-Core-2xXeon-E5345.output
 PASS: Intel-KnightsLanding-XeonPhi-7210.output
 PASS: Intel-KnightsCorner-XeonPhi-SE10P.output
+PASS: AMD-19h-Zen3-2xEpyc-7763.output
 PASS: AMD-17h-Zen-2xEpyc-7451.output
 PASS: AMD-15h-Piledriver-4xOpteron-6348.output
 PASS: AMD-15h-Bulldozer-4xOpteron-6272.output
@@ -118,10 +137,11 @@
 PASS: AMD-K10-Istanbul-8xOpteron-8439SE.output
 PASS: AMD-K8-SantaRosa-2xOpteron-2218.output
 PASS: AMD-K8-SledgeHammer-2xOpteron-250.output
+PASS: Hygon-Dhyana-32cores.output
 PASS: Zhaoxin-CentaurHauls-ZXD-4600.output
 PASS: Zhaoxin-Shanghai-KaiSheng-ZXC+-FC1081.output
-# TOTAL: 20
-# PASS:  20
+# TOTAL: 25
+# PASS:  25
 # SKIP:  0
 # XFAIL: 0
 # FAIL:  0

--
Gitblit v1.9.3