Attachment 201113 Details for Bug 231844 – Diff file to update to 2.0.3

Diff file to update to 2.0.3

hwloc-2.0.3.diff.txt (text/plain), 13.59 KB, created by wen on 2019-01-14 07:41:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: wen

Created: 2019-01-14 07:41:48 UTC

Size: 13.59 KB

patch

obsolete

>diff -u hwloc/Makefile hwloc2/Makefile
>--- hwloc/Makefile	2019-01-14 14:25:21.543099000 +0800
>+++ hwloc2/Makefile	2019-01-14 15:19:06.061639000 +0800
>@@ -1,10 +1,10 @@
>-# $FreeBSD: head/devel/hwloc/Makefile 483812 2018-11-02 14:33:29Z linimon $
>+# $FreeBSD:  $
> 
> PORTNAME=	hwloc
>-PORTVERSION=	1.11.12
>+PORTVERSION=	2.0.3
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v${PORTVERSION:R}/downloads/ \
>-		http://icl.cs.utk.edu/open-mpi/software/hwloc/v${PORTVERSION:R}/downloads/
>+MASTER_SITES=https://download.open-mpi.org/release/hwloc/v${PORTVERSION:C/.[1-9]*$//}/ \
>+		https://icl.cs.utk.edu/open-mpi/software/hwloc/v${PORTVERSION:C/.[1-9]*$//}/downloads/
> 
> MAINTAINER=	phd_kimberlite@yahoo.co.jp
> COMMENT=	Portable Hardware Locality software package
>@@ -12,7 +12,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386 powerpc64
>+ONLY_FOR_ARCHS=		amd64 aarch64 armv6 armv7 i386
> ONLY_FOR_ARCHS_REASON=	has not been ported to this architecture
> 
> LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
>diff -u hwloc/distinfo hwloc2/distinfo
>--- hwloc/distinfo	2019-01-14 14:25:45.984810000 +0800
>+++ hwloc2/distinfo	2019-01-14 15:19:19.500381000 +0800
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1547447145
>-SHA256 (hwloc-1.11.12.tar.bz2) = ddfb7b9b4571551165b0fd824a340e58814c8c2b4af64c818579d4bc695a417d
>-SIZE (hwloc-1.11.12.tar.bz2) = 4116387
>+TIMESTAMP = 1547450359
>+SHA256 (hwloc-2.0.3.tar.bz2) = e393aaf39e576b329a2bff3096d9618d4e39f416874390b58e6573349554c725
>+SIZE (hwloc-2.0.3.tar.bz2) = 6044274
>Only in hwloc: files
>diff -u hwloc/pkg-plist hwloc2/pkg-plist
>--- hwloc/pkg-plist	2019-01-14 14:26:59.688973000 +0800
>+++ hwloc2/pkg-plist	2019-01-14 15:21:32.649368000 +0800
>@@ -1,11 +1,81 @@
>+bin/hwloc-gather-cpuid
>+include/hwloc/distances.h
>+include/hwloc/export.h
>+include/hwloc/shmem.h
>+lib/libhwloc.so.15
>+lib/libhwloc.so.15.0.2
>+man/man1/hwloc-gather-cpuid.1.gz
>+man/man3/HWLOC_DISTANCES_ADD_FLAG_GROUP.3.gz
>+man/man3/HWLOC_DISTANCES_ADD_FLAG_GROUP_INACCURATE.3.gz
>+man/man3/HWLOC_DISTANCES_KIND_FROM_OS.3.gz
>+man/man3/HWLOC_DISTANCES_KIND_FROM_USER.3.gz
>+man/man3/HWLOC_DISTANCES_KIND_MEANS_BANDWIDTH.3.gz
>+man/man3/HWLOC_DISTANCES_KIND_MEANS_LATENCY.3.gz
>+man/man3/HWLOC_OBJ_L1CACHE.3.gz
>+man/man3/HWLOC_OBJ_L1ICACHE.3.gz
>+man/man3/HWLOC_OBJ_L2CACHE.3.gz
>+man/man3/HWLOC_OBJ_L2ICACHE.3.gz
>+man/man3/HWLOC_OBJ_L3CACHE.3.gz
>+man/man3/HWLOC_OBJ_L3ICACHE.3.gz
>+man/man3/HWLOC_OBJ_L4CACHE.3.gz
>+man/man3/HWLOC_OBJ_L5CACHE.3.gz
>+man/man3/HWLOC_RESTRICT_FLAG_REMOVE_CPULESS.3.gz
>+man/man3/HWLOC_TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES.3.gz
>+man/man3/HWLOC_TYPE_FILTER_KEEP_ALL.3.gz
>+man/man3/HWLOC_TYPE_FILTER_KEEP_IMPORTANT.3.gz
>+man/man3/HWLOC_TYPE_FILTER_KEEP_NONE.3.gz
>+man/man3/HWLOC_TYPE_FILTER_KEEP_STRUCTURE.3.gz
>+man/man3/hwloc_distances_add.3.gz
>+man/man3/hwloc_distances_add_flag_e.3.gz
>+man/man3/hwloc_distances_get.3.gz
>+man/man3/hwloc_distances_get_by_depth.3.gz
>+man/man3/hwloc_distances_get_by_type.3.gz
>+man/man3/hwloc_distances_kind_e.3.gz
>+man/man3/hwloc_distances_obj_index.3.gz
>+man/man3/hwloc_distances_obj_pair_values.3.gz
>+man/man3/hwloc_distances_release.3.gz
>+man/man3/hwloc_distances_remove.3.gz
>+man/man3/hwloc_distances_remove_by_depth.3.gz
>+man/man3/hwloc_distances_remove_by_type.3.gz
>+man/man3/hwloc_get_memory_parents_depth.3.gz
>+man/man3/hwloc_info_s.3.gz
>+man/man3/hwloc_linux_read_path_as_cpumask.3.gz
>+man/man3/hwloc_obj_add_other_obj_sets.3.gz
>+man/man3/hwloc_obj_attr_u_hwloc_numanode_attr_s.3.gz
>+man/man3/hwloc_obj_attr_u_hwloc_numanode_attr_s_hwloc_memory_page_type_s.3.gz
>+man/man3/hwloc_obj_type_is_cache.3.gz
>+man/man3/hwloc_obj_type_is_dcache.3.gz
>+man/man3/hwloc_obj_type_is_icache.3.gz
>+man/man3/hwloc_obj_type_is_io.3.gz
>+man/man3/hwloc_obj_type_is_memory.3.gz
>+man/man3/hwloc_obj_type_is_normal.3.gz
>+man/man3/hwloc_shmem_topology_adopt.3.gz
>+man/man3/hwloc_shmem_topology_get_length.3.gz
>+man/man3/hwloc_shmem_topology_write.3.gz
>+man/man3/hwloc_topology_abi_check.3.gz
>+man/man3/hwloc_topology_alloc_group_object.3.gz
>+man/man3/hwloc_topology_get_type_filter.3.gz
>+man/man3/hwloc_topology_insert_group_object.3.gz
>+man/man3/hwloc_topology_insert_misc_object.3.gz
>+man/man3/hwloc_topology_set_all_types_filter.3.gz
>+man/man3/hwloc_topology_set_cache_types_filter.3.gz
>+man/man3/hwloc_topology_set_icache_types_filter.3.gz
>+man/man3/hwloc_topology_set_io_types_filter.3.gz
>+man/man3/hwloc_topology_set_type_filter.3.gz
>+man/man3/hwloc_type_filter_e.3.gz
>+man/man3/hwloc_type_sscanf.3.gz
>+man/man3/hwloc_type_sscanf_as_depth.3.gz
>+man/man3/hwlocality_distances_add.3.gz
>+man/man3/hwlocality_distances_consult.3.gz
>+man/man3/hwlocality_distances_get.3.gz
>+man/man3/hwlocality_helper_types.3.gz
>+man/man3/hwlocality_setsource.3.gz
>+man/man3/hwlocality_shmem.3.gz
> bin/hwloc-annotate
>-bin/hwloc-assembler
>-bin/hwloc-assembler-remote
> bin/hwloc-bind
> bin/hwloc-calc
> bin/hwloc-compress-dir
> bin/hwloc-diff
>-bin/hwloc-distances
> bin/hwloc-distrib
> bin/hwloc-info
> bin/hwloc-ls
>@@ -24,7 +94,6 @@
> include/hwloc/helper.h
> include/hwloc/inlines.h
> include/hwloc/intel-mic.h
>-include/hwloc/myriexpress.h
> include/hwloc/nvml.h
> include/hwloc/opencl.h
> include/hwloc/openfabrics-verbs.h
>@@ -32,17 +101,12 @@
> include/hwloc/rename.h
> lib/libhwloc.a
> lib/libhwloc.so
>-lib/libhwloc.so.5
>-lib/libhwloc.so.5.7.9
> libdata/pkgconfig/hwloc.pc
> man/man1/hwloc-annotate.1.gz
>-man/man1/hwloc-assembler-remote.1.gz
>-man/man1/hwloc-assembler.1.gz
> man/man1/hwloc-bind.1.gz
> man/man1/hwloc-calc.1.gz
> man/man1/hwloc-compress-dir.1.gz
> man/man1/hwloc-diff.1.gz
>-man/man1/hwloc-distances.1.gz
> man/man1/hwloc-distrib.1.gz
> man/man1/hwloc-info.1.gz
> man/man1/hwloc-ls.1.gz
>@@ -66,13 +130,11 @@
> man/man3/HWLOC_MEMBIND_NEXTTOUCH.3.gz
> man/man3/HWLOC_MEMBIND_NOCPUBIND.3.gz
> man/man3/HWLOC_MEMBIND_PROCESS.3.gz
>-man/man3/HWLOC_MEMBIND_REPLICATE.3.gz
> man/man3/HWLOC_MEMBIND_STRICT.3.gz
> man/man3/HWLOC_MEMBIND_THREAD.3.gz
> man/man3/HWLOC_OBJ_BRIDGE.3.gz
> man/man3/HWLOC_OBJ_BRIDGE_HOST.3.gz
> man/man3/HWLOC_OBJ_BRIDGE_PCI.3.gz
>-man/man3/HWLOC_OBJ_CACHE.3.gz
> man/man3/HWLOC_OBJ_CACHE_DATA.3.gz
> man/man3/HWLOC_OBJ_CACHE_INSTRUCTION.3.gz
> man/man3/HWLOC_OBJ_CACHE_UNIFIED.3.gz
>@@ -91,8 +153,6 @@
> man/man3/HWLOC_OBJ_PACKAGE.3.gz
> man/man3/HWLOC_OBJ_PCI_DEVICE.3.gz
> man/man3/HWLOC_OBJ_PU.3.gz
>-man/man3/HWLOC_OBJ_SYSTEM.3.gz
>-man/man3/HWLOC_RESTRICT_FLAG_ADAPT_DISTANCES.3.gz
> man/man3/HWLOC_RESTRICT_FLAG_ADAPT_IO.3.gz
> man/man3/HWLOC_RESTRICT_FLAG_ADAPT_MISC.3.gz
> man/man3/HWLOC_TOPOLOGY_DIFF_APPLY_REVERSE.3.gz
>@@ -101,11 +161,7 @@
> man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_NAME.3.gz
> man/man3/HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_SIZE.3.gz
> man/man3/HWLOC_TOPOLOGY_DIFF_TOO_COMPLEX.3.gz
>-man/man3/HWLOC_TOPOLOGY_FLAG_ICACHES.3.gz
>-man/man3/HWLOC_TOPOLOGY_FLAG_IO_BRIDGES.3.gz
>-man/man3/HWLOC_TOPOLOGY_FLAG_IO_DEVICES.3.gz
> man/man3/HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM.3.gz
>-man/man3/HWLOC_TOPOLOGY_FLAG_WHOLE_IO.3.gz
> man/man3/HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM.3.gz
> man/man3/HWLOC_TYPE_DEPTH_BRIDGE.3.gz
> man/man3/HWLOC_TYPE_DEPTH_MULTIPLE.3.gz
>@@ -115,9 +171,7 @@
> man/man3/HWLOC_TYPE_UNORDERED.3.gz
> man/man3/hwloc_alloc.3.gz
> man/man3/hwloc_alloc_membind.3.gz
>-man/man3/hwloc_alloc_membind_nodeset.3.gz
> man/man3/hwloc_alloc_membind_policy.3.gz
>-man/man3/hwloc_alloc_membind_policy_nodeset.3.gz
> man/man3/hwloc_bitmap_allbut.3.gz
> man/man3/hwloc_bitmap_alloc.3.gz
> man/man3/hwloc_bitmap_alloc_full.3.gz
>@@ -177,13 +231,11 @@
> man/man3/hwloc_cpuset_from_linux_libnuma_bitmask.3.gz
> man/man3/hwloc_cpuset_from_linux_libnuma_ulongs.3.gz
> man/man3/hwloc_cpuset_from_nodeset.3.gz
>-man/man3/hwloc_cpuset_from_nodeset_strict.3.gz
> man/man3/hwloc_cpuset_t.3.gz
> man/man3/hwloc_cpuset_to_glibc_sched_affinity.3.gz
> man/man3/hwloc_cpuset_to_linux_libnuma_bitmask.3.gz
> man/man3/hwloc_cpuset_to_linux_libnuma_ulongs.3.gz
> man/man3/hwloc_cpuset_to_nodeset.3.gz
>-man/man3/hwloc_cpuset_to_nodeset_strict.3.gz
> man/man3/hwloc_cuda_get_device_cpuset.3.gz
> man/man3/hwloc_cuda_get_device_osdev.3.gz
> man/man3/hwloc_cuda_get_device_osdev_by_index.3.gz
>@@ -193,8 +245,6 @@
> man/man3/hwloc_cudart_get_device_osdev_by_index.3.gz
> man/man3/hwloc_cudart_get_device_pci_ids.3.gz
> man/man3/hwloc_cudart_get_device_pcidev.3.gz
>-man/man3/hwloc_custom_insert_group_object_by_parent.3.gz
>-man/man3/hwloc_custom_insert_topology.3.gz
> man/man3/hwloc_distances_s.3.gz
> man/man3/hwloc_distrib.3.gz
> man/man3/hwloc_distrib_flags_e.3.gz
>@@ -206,7 +256,6 @@
> man/man3/hwloc_get_ancestor_obj_by_type.3.gz
> man/man3/hwloc_get_api_version.3.gz
> man/man3/hwloc_get_area_membind.3.gz
>-man/man3/hwloc_get_area_membind_nodeset.3.gz
> man/man3/hwloc_get_area_memlocation.3.gz
> man/man3/hwloc_get_cache_covering_cpuset.3.gz
> man/man3/hwloc_get_cache_type_depth.3.gz
>@@ -215,14 +264,10 @@
> man/man3/hwloc_get_common_ancestor_obj.3.gz
> man/man3/hwloc_get_cpubind.3.gz
> man/man3/hwloc_get_depth_type.3.gz
>-man/man3/hwloc_get_distance_matrix_covering_obj_by_depth.3.gz
> man/man3/hwloc_get_first_largest_obj_inside_cpuset.3.gz
>-man/man3/hwloc_get_hostbridge_by_pcibus.3.gz
> man/man3/hwloc_get_largest_objs_inside_cpuset.3.gz
> man/man3/hwloc_get_last_cpu_location.3.gz
>-man/man3/hwloc_get_latency.3.gz
> man/man3/hwloc_get_membind.3.gz
>-man/man3/hwloc_get_membind_nodeset.3.gz
> man/man3/hwloc_get_nbobjs_by_depth.3.gz
> man/man3/hwloc_get_nbobjs_by_type.3.gz
> man/man3/hwloc_get_nbobjs_inside_cpuset_by_depth.3.gz
>@@ -251,7 +296,6 @@
> man/man3/hwloc_get_proc_cpubind.3.gz
> man/man3/hwloc_get_proc_last_cpu_location.3.gz
> man/man3/hwloc_get_proc_membind.3.gz
>-man/man3/hwloc_get_proc_membind_nodeset.3.gz
> man/man3/hwloc_get_pu_obj_by_os_index.3.gz
> man/man3/hwloc_get_root_obj.3.gz
> man/man3/hwloc_get_shared_cache_covering_obj.3.gz
>@@ -260,8 +304,6 @@
> man/man3/hwloc_get_type_depth_e.3.gz
> man/man3/hwloc_get_type_or_above_depth.3.gz
> man/man3/hwloc_get_type_or_below_depth.3.gz
>-man/man3/hwloc_get_whole_distance_matrix_by_depth.3.gz
>-man/man3/hwloc_get_whole_distance_matrix_by_type.3.gz
> man/man3/hwloc_gl_get_display_by_osdev.3.gz
> man/man3/hwloc_gl_get_display_osdev_by_name.3.gz
> man/man3/hwloc_gl_get_display_osdev_by_port_device.3.gz
>@@ -272,12 +314,9 @@
> man/man3/hwloc_intel_mic_get_device_osdev_by_index.3.gz
> man/man3/hwloc_linux_get_tid_cpubind.3.gz
> man/man3/hwloc_linux_get_tid_last_cpu_location.3.gz
>-man/man3/hwloc_linux_parse_cpumap_file.3.gz
> man/man3/hwloc_linux_set_tid_cpubind.3.gz
> man/man3/hwloc_membind_flags_t.3.gz
> man/man3/hwloc_membind_policy_t.3.gz
>-man/man3/hwloc_mx_board_get_device_cpuset.3.gz
>-man/man3/hwloc_mx_endpoint_get_device_cpuset.3.gz
> man/man3/hwloc_nodeset_from_linux_libnuma_bitmask.3.gz
> man/man3/hwloc_nodeset_from_linux_libnuma_ulongs.3.gz
> man/man3/hwloc_nodeset_t.3.gz
>@@ -299,17 +338,12 @@
> man/man3/hwloc_obj_bridge_type_t.3.gz
> man/man3/hwloc_obj_cache_type_e.3.gz
> man/man3/hwloc_obj_cache_type_t.3.gz
>-man/man3/hwloc_obj_cpuset_snprintf.3.gz
> man/man3/hwloc_obj_get_info_by_name.3.gz
>-man/man3/hwloc_obj_info_s.3.gz
> man/man3/hwloc_obj_is_in_subtree.3.gz
>-man/man3/hwloc_obj_memory_s.3.gz
>-man/man3/hwloc_obj_memory_s_hwloc_obj_memory_page_type_s.3.gz
> man/man3/hwloc_obj_osdev_type_e.3.gz
> man/man3/hwloc_obj_osdev_type_t.3.gz
> man/man3/hwloc_obj_t.3.gz
> man/man3/hwloc_obj_type_snprintf.3.gz
>-man/man3/hwloc_obj_type_sscanf.3.gz
> man/man3/hwloc_obj_type_string.3.gz
> man/man3/hwloc_obj_type_t.3.gz
> man/man3/hwloc_opencl_get_device_cpuset.3.gz
>@@ -317,13 +351,10 @@
> man/man3/hwloc_opencl_get_device_osdev_by_index.3.gz
> man/man3/hwloc_restrict_flags_e.3.gz
> man/man3/hwloc_set_area_membind.3.gz
>-man/man3/hwloc_set_area_membind_nodeset.3.gz
> man/man3/hwloc_set_cpubind.3.gz
> man/man3/hwloc_set_membind.3.gz
>-man/man3/hwloc_set_membind_nodeset.3.gz
> man/man3/hwloc_set_proc_cpubind.3.gz
> man/man3/hwloc_set_proc_membind.3.gz
>-man/man3/hwloc_set_proc_membind_nodeset.3.gz
> man/man3/hwloc_set_thread_cpubind.3.gz
> man/man3/hwloc_topology_check.3.gz
> man/man3/hwloc_topology_cpubind_support.3.gz
>@@ -352,24 +383,15 @@
> man/man3/hwloc_topology_get_complete_nodeset.3.gz
> man/man3/hwloc_topology_get_depth.3.gz
> man/man3/hwloc_topology_get_flags.3.gz
>-man/man3/hwloc_topology_get_online_cpuset.3.gz
> man/man3/hwloc_topology_get_topology_cpuset.3.gz
> man/man3/hwloc_topology_get_topology_nodeset.3.gz
> man/man3/hwloc_topology_get_userdata.3.gz
>-man/man3/hwloc_topology_ignore_all_keep_structure.3.gz
>-man/man3/hwloc_topology_ignore_type.3.gz
>-man/man3/hwloc_topology_ignore_type_keep_structure.3.gz
> man/man3/hwloc_topology_init.3.gz
>-man/man3/hwloc_topology_insert_misc_object_by_cpuset.3.gz
>-man/man3/hwloc_topology_insert_misc_object_by_parent.3.gz
> man/man3/hwloc_topology_is_thissystem.3.gz
> man/man3/hwloc_topology_load.3.gz
> man/man3/hwloc_topology_membind_support.3.gz
> man/man3/hwloc_topology_restrict.3.gz
>-man/man3/hwloc_topology_set_custom.3.gz
>-man/man3/hwloc_topology_set_distance_matrix.3.gz
> man/man3/hwloc_topology_set_flags.3.gz
>-man/man3/hwloc_topology_set_fsroot.3.gz
> man/man3/hwloc_topology_set_pid.3.gz
> man/man3/hwloc_topology_set_synthetic.3.gz
> man/man3/hwloc_topology_set_userdata.3.gz
>@@ -387,9 +409,7 @@
> man/man3/hwlocality_creation.3.gz
> man/man3/hwlocality_cuda.3.gz
> man/man3/hwlocality_cudart.3.gz
>-man/man3/hwlocality_custom.3.gz
> man/man3/hwlocality_diff.3.gz
>-man/man3/hwlocality_distances.3.gz
> man/man3/hwlocality_gl.3.gz
> man/man3/hwlocality_glibc_sched.3.gz
> man/man3/hwlocality_helper_ancestors.3.gz
>@@ -407,7 +427,6 @@
> man/man3/hwlocality_linux_libnuma_bitmask.3.gz
> man/man3/hwlocality_linux_libnuma_ulongs.3.gz
> man/man3/hwlocality_membinding.3.gz
>-man/man3/hwlocality_myriexpress.3.gz
> man/man3/hwlocality_nvml.3.gz
> man/man3/hwlocality_object_sets.3.gz
> man/man3/hwlocality_object_strings.3.gz
>@@ -420,5 +439,7 @@
> man/man3/hwlocality_xmlexport.3.gz
> man/man7/hwloc.7.gz
> %%CAIRO%%share/applications/lstopo.desktop
>-share/hwloc/hwloc-valgrind.supp
>-share/hwloc/hwloc.dtd
>+%%DATADIR%%/hwloc-valgrind.supp
>+%%DATADIR%%/hwloc.dtd
>+%%DATADIR%%/hwloc2-diff.dtd
>+%%DATADIR%%/hwloc2.dtd

Actions: View

Attachments on bug 231844: 197676 | 201113