summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--parallel/hwloc/Makefile24
-rw-r--r--parallel/hwloc/PLIST35
-rw-r--r--parallel/hwloc/buildlink3.mk4
-rw-r--r--parallel/hwloc/distinfo13
-rw-r--r--parallel/hwloc/patches/patch-config_hwloc.m424
-rw-r--r--parallel/hwloc/patches/patch-configure.ac14
-rw-r--r--parallel/hwloc/patches/patch-src_Makefile.am16
-rw-r--r--parallel/hwloc/patches/patch-src_topology-netbsd.c172
-rw-r--r--parallel/hwloc/patches/patch-src_topology.c16
9 files changed, 51 insertions, 267 deletions
diff --git a/parallel/hwloc/Makefile b/parallel/hwloc/Makefile
index f363ede3b7c..e0cb5d5c687 100644
--- a/parallel/hwloc/Makefile
+++ b/parallel/hwloc/Makefile
@@ -1,30 +1,28 @@
-# $NetBSD: Makefile,v 1.10 2013/03/19 20:06:10 sbd Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/15 20:46:16 adam Exp $
-DISTNAME= hwloc-1.5
-PKGREVISION= 2
+DISTNAME= hwloc-1.7
CATEGORIES= parallel
-MASTER_SITES= http://www.open-mpi.org/software/hwloc/v1.5/downloads/
+MASTER_SITES= http://www.open-mpi.org/software/hwloc/v${PKGVERSION_NOREV}/downloads/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= asau@inbox.ru
HOMEPAGE= http://www.open-mpi.org/projects/hwloc/
COMMENT= Portable Hardware Locality
LICENSE= modified-bsd
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS= pkg-config
-USE_TOOLS+= aclocal automake autoconf autoreconf
-
-CONFIGURE_ARGS+= --enable-debug --enable-picky
+USE_LIBTOOL= yes
+USE_TOOLS+= aclocal automake autoconf autoreconf pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-picky
TEST_TARGET= check
pre-configure:
- $(RUN) cd $(WRKSRC) && autoreconf -ivf
+ cd ${WRKSRC} && autoreconf -ivf
# libpci??
#.include "../../graphics/cairo/buildlink3.mk" # optional
-.include "../../textproc/libxml2/buildlink3.mk" # optional
-.include "../../mk/curses.buildlink3.mk" # optional
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/parallel/hwloc/PLIST b/parallel/hwloc/PLIST
index bd5a424a52b..afd232ad5c6 100644
--- a/parallel/hwloc/PLIST
+++ b/parallel/hwloc/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2012/10/17 03:11:44 asau Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/04/15 20:46:17 adam Exp $
+bin/hwloc-annotate
bin/hwloc-assembler
bin/hwloc-assembler-remote
bin/hwloc-bind
@@ -15,12 +16,18 @@ include/hwloc/autogen/config.h
include/hwloc/bitmap.h
include/hwloc/cuda.h
include/hwloc/cudart.h
+include/hwloc/gl.h
include/hwloc/helper.h
+include/hwloc/intel-mic.h
include/hwloc/myriexpress.h
+include/hwloc/nvml.h
+include/hwloc/opencl.h
include/hwloc/openfabrics-verbs.h
+include/hwloc/plugins.h
include/hwloc/rename.h
lib/libhwloc.la
lib/pkgconfig/hwloc.pc
+man/man1/hwloc-annotate.1
man/man1/hwloc-assembler-remote.1
man/man1/hwloc-assembler.1
man/man1/hwloc-bind.1
@@ -62,6 +69,7 @@ man/man3/HWLOC_OBJ_MACHINE.3
man/man3/HWLOC_OBJ_MISC.3
man/man3/HWLOC_OBJ_NODE.3
man/man3/HWLOC_OBJ_OSDEV_BLOCK.3
+man/man3/HWLOC_OBJ_OSDEV_COPROC.3
man/man3/HWLOC_OBJ_OSDEV_DMA.3
man/man3/HWLOC_OBJ_OSDEV_GPU.3
man/man3/HWLOC_OBJ_OSDEV_NETWORK.3
@@ -159,9 +167,12 @@ man/man3/hwloc_cpuset_to_linux_libnuma_ulongs.3
man/man3/hwloc_cpuset_to_nodeset.3
man/man3/hwloc_cpuset_to_nodeset_strict.3
man/man3/hwloc_cuda_get_device_cpuset.3
+man/man3/hwloc_cuda_get_device_osdev.3
+man/man3/hwloc_cuda_get_device_osdev_by_index.3
man/man3/hwloc_cuda_get_device_pci_ids.3
man/man3/hwloc_cuda_get_device_pcidev.3
man/man3/hwloc_cudart_get_device_cpuset.3
+man/man3/hwloc_cudart_get_device_osdev_by_index.3
man/man3/hwloc_cudart_get_device_pci_ids.3
man/man3/hwloc_cudart_get_device_pcidev.3
man/man3/hwloc_custom_insert_group_object_by_parent.3
@@ -169,6 +180,8 @@ man/man3/hwloc_custom_insert_topology.3
man/man3/hwloc_distances_s.3
man/man3/hwloc_distribute.3
man/man3/hwloc_distributev.3
+man/man3/hwloc_export_obj_userdata.3
+man/man3/hwloc_export_obj_userdata_base64.3
man/man3/hwloc_free.3
man/man3/hwloc_free_xmlbuffer.3
man/man3/hwloc_get_ancestor_obj_by_depth.3
@@ -230,8 +243,14 @@ man/man3/hwloc_get_type_or_above_depth.3
man/man3/hwloc_get_type_or_below_depth.3
man/man3/hwloc_get_whole_distance_matrix_by_depth.3
man/man3/hwloc_get_whole_distance_matrix_by_type.3
+man/man3/hwloc_gl_get_display_by_osdev.3
+man/man3/hwloc_gl_get_display_osdev_by_name.3
+man/man3/hwloc_gl_get_display_osdev_by_port_device.3
man/man3/hwloc_ibv_get_device_cpuset.3
+man/man3/hwloc_ibv_get_device_osdev.3
man/man3/hwloc_ibv_get_device_osdev_by_name.3
+man/man3/hwloc_intel_mic_get_device_cpuset.3
+man/man3/hwloc_intel_mic_get_device_osdev_by_index.3
man/man3/hwloc_linux_get_tid_cpubind.3
man/man3/hwloc_linux_parse_cpumap_file.3
man/man3/hwloc_linux_set_tid_cpubind.3
@@ -244,6 +263,9 @@ man/man3/hwloc_nodeset_from_linux_libnuma_ulongs.3
man/man3/hwloc_nodeset_t.3
man/man3/hwloc_nodeset_to_linux_libnuma_bitmask.3
man/man3/hwloc_nodeset_to_linux_libnuma_ulongs.3
+man/man3/hwloc_nvml_get_device_cpuset.3
+man/man3/hwloc_nvml_get_device_osdev.3
+man/man3/hwloc_nvml_get_device_osdev_by_index.3
man/man3/hwloc_obj.3
man/man3/hwloc_obj_add_info.3
man/man3/hwloc_obj_attr_snprintf.3
@@ -271,6 +293,9 @@ man/man3/hwloc_obj_type_of_string.3
man/man3/hwloc_obj_type_snprintf.3
man/man3/hwloc_obj_type_string.3
man/man3/hwloc_obj_type_t.3
+man/man3/hwloc_opencl_get_device_cpuset.3
+man/man3/hwloc_opencl_get_device_osdev.3
+man/man3/hwloc_opencl_get_device_osdev_by_index.3
man/man3/hwloc_restrict_flags_e.3
man/man3/hwloc_set_area_membind.3
man/man3/hwloc_set_area_membind_nodeset.3
@@ -293,6 +318,7 @@ man/man3/hwloc_topology_get_allowed_nodeset.3
man/man3/hwloc_topology_get_complete_cpuset.3
man/man3/hwloc_topology_get_complete_nodeset.3
man/man3/hwloc_topology_get_depth.3
+man/man3/hwloc_topology_get_flags.3
man/man3/hwloc_topology_get_online_cpuset.3
man/man3/hwloc_topology_get_support.3
man/man3/hwloc_topology_get_topology_cpuset.3
@@ -313,6 +339,8 @@ man/man3/hwloc_topology_set_flags.3
man/man3/hwloc_topology_set_fsroot.3
man/man3/hwloc_topology_set_pid.3
man/man3/hwloc_topology_set_synthetic.3
+man/man3/hwloc_topology_set_userdata_export_callback.3
+man/man3/hwloc_topology_set_userdata_import_callback.3
man/man3/hwloc_topology_set_xml.3
man/man3/hwloc_topology_set_xmlbuffer.3
man/man3/hwloc_topology_support.3
@@ -328,6 +356,7 @@ man/man3/hwlocality_cuda.3
man/man3/hwlocality_cudart.3
man/man3/hwlocality_custom.3
man/man3/hwlocality_distances.3
+man/man3/hwlocality_gl.3
man/man3/hwlocality_glibc_sched.3
man/man3/hwlocality_helper_binding.3
man/man3/hwlocality_helper_cpuset.3
@@ -341,18 +370,22 @@ man/man3/hwlocality_helper_traversal.3
man/man3/hwlocality_helper_traversal_basic.3
man/man3/hwlocality_helper_types.3
man/man3/hwlocality_information.3
+man/man3/hwlocality_intel_mic.3
man/man3/hwlocality_linux.3
man/man3/hwlocality_linux_libnuma_bitmask.3
man/man3/hwlocality_linux_libnuma_ulongs.3
man/man3/hwlocality_membinding.3
man/man3/hwlocality_myriexpress.3
+man/man3/hwlocality_nvml.3
man/man3/hwlocality_objects.3
+man/man3/hwlocality_opencl.3
man/man3/hwlocality_openfabrics.3
man/man3/hwlocality_sets.3
man/man3/hwlocality_tinker.3
man/man3/hwlocality_topology.3
man/man3/hwlocality_traversal.3
man/man3/hwlocality_types.3
+man/man3/hwlocality_xmlexport.3
man/man7/hwloc.7
share/doc/hwloc/hwloc-a4.pdf
share/doc/hwloc/hwloc-letter.pdf
diff --git a/parallel/hwloc/buildlink3.mk b/parallel/hwloc/buildlink3.mk
index b65f9990c06..81b9fe9e15c 100644
--- a/parallel/hwloc/buildlink3.mk
+++ b/parallel/hwloc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/10/24 05:49:25 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2013/04/15 20:46:17 adam Exp $
BUILDLINK_TREE+= hwloc
@@ -8,7 +8,7 @@ HWLOC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.hwloc+= hwloc>=1.4
BUILDLINK_PKGSRCDIR.hwloc?= ../../parallel/hwloc
-.include "../../textproc/libxml2/buildlink3.mk" # optional
+.include "../../textproc/libxml2/buildlink3.mk"
.endif # HWLOC_BUILDLINK3_MK
BUILDLINK_TREE+= -hwloc
diff --git a/parallel/hwloc/distinfo b/parallel/hwloc/distinfo
index 1b6ac8efb4f..03a82dbbfa6 100644
--- a/parallel/hwloc/distinfo
+++ b/parallel/hwloc/distinfo
@@ -1,10 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/10/26 20:23:25 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/04/15 20:46:17 adam Exp $
-SHA1 (hwloc-1.5.tar.gz) = 0ff8c81481987627dc21b3ed826caaefc94d4d0f
-RMD160 (hwloc-1.5.tar.gz) = eb9a055db25561a8d8aa35c6a54f9787ee3839ed
-Size (hwloc-1.5.tar.gz) = 3118586 bytes
-SHA1 (patch-config_hwloc.m4) = 9a76635c82021fe79d7ffab0642b7d667c43b0d5
-SHA1 (patch-configure.ac) = 5ee0bdd92edf7b33fc41ca37eac8a93ab2c28bbe
-SHA1 (patch-src_Makefile.am) = 8da2df8954347d6de72b18dee6f5141db549f9a5
-SHA1 (patch-src_topology-netbsd.c) = fdce87839e7215664d783bace5aac29f8a835bd2
-SHA1 (patch-src_topology.c) = 4e7bdac212a96c51e4464bed05f2ac54bc6f5a53
+SHA1 (hwloc-1.7.tar.bz2) = 60f5ca622ee70fbc098f372d7c8e651ed27e7e65
+RMD160 (hwloc-1.7.tar.bz2) = f44b43bdd814bc2a52db0bc173dfe162dde14cd1
+Size (hwloc-1.7.tar.bz2) = 3300570 bytes
diff --git a/parallel/hwloc/patches/patch-config_hwloc.m4 b/parallel/hwloc/patches/patch-config_hwloc.m4
deleted file mode 100644
index 0e5c52024e3..00000000000
--- a/parallel/hwloc/patches/patch-config_hwloc.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-config_hwloc.m4,v 1.1.1.1 2012/03/21 13:31:35 asau Exp $
-
---- config/hwloc.m4.orig 2012-01-26 09:49:56.000000000 +0000
-+++ config/hwloc.m4
-@@ -210,6 +210,11 @@ EOF])
- hwloc_freebsd=yes
- AC_MSG_RESULT([FreeBSD])
- ;;
-+ *-*-*netbsd*)
-+ AC_DEFINE(HWLOC_NETBSD_SYS, 1, [Define to 1 on *NETBSD])
-+ hwloc_netbsd=yes
-+ AC_MSG_RESULT([NetBSD])
-+ ;;
- *)
- AC_MSG_RESULT([Unsupported! ($target)])
- AC_DEFINE(HWLOC_UNSUPPORTED_SYS, 1, [Define to 1 on unsupported systems])
-@@ -760,6 +765,7 @@ AC_DEFUN([HWLOC_DO_AM_CONDITIONALS],[
- AM_CONDITIONAL([HWLOC_HAVE_LINUX], [test "x$hwloc_linux" = "xyes"])
- AM_CONDITIONAL([HWLOC_HAVE_IRIX], [test "x$hwloc_irix" = "xyes"])
- AM_CONDITIONAL([HWLOC_HAVE_DARWIN], [test "x$hwloc_darwin" = "xyes"])
-+ AM_CONDITIONAL([HWLOC_HAVE_NETBSD], [test "x$hwloc_netbsd" = "xyes"])
- AM_CONDITIONAL([HWLOC_HAVE_FREEBSD], [test "x$hwloc_freebsd" = "xyes"])
- AM_CONDITIONAL([HWLOC_HAVE_SOLARIS], [test "x$hwloc_solaris" = "xyes"])
- AM_CONDITIONAL([HWLOC_HAVE_AIX], [test "x$hwloc_aix" = "xyes"])
diff --git a/parallel/hwloc/patches/patch-configure.ac b/parallel/hwloc/patches/patch-configure.ac
deleted file mode 100644
index 37f47c20a68..00000000000
--- a/parallel/hwloc/patches/patch-configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2012/05/10 10:55:39 wiz Exp $
-
-Fix build with automake-1.12.
-
---- configure.ac.orig 2012-01-18 15:51:00.000000000 +0000
-+++ configure.ac
-@@ -150,6 +150,7 @@ LIBS="$HWLOC_EMBEDDED_LIBS $LIBS"
- AM_ENABLE_SHARED
- AM_DISABLE_STATIC
- AM_PROG_LIBTOOL([win32-dll])
-+AM_PROG_AR
- LT_LANG([C])
-
- # Party on
diff --git a/parallel/hwloc/patches/patch-src_Makefile.am b/parallel/hwloc/patches/patch-src_Makefile.am
deleted file mode 100644
index 29de6a0b060..00000000000
--- a/parallel/hwloc/patches/patch-src_Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_Makefile.am,v 1.1.1.1 2012/03/21 13:31:35 asau Exp $
-
---- src/Makefile.am.orig 2012-01-26 09:49:56.000000000 +0000
-+++ src/Makefile.am
-@@ -71,6 +71,11 @@ if HWLOC_HAVE_DARWIN
- sources += topology-darwin.c
- endif HWLOC_HAVE_DARWIN
-
-+if HWLOC_HAVE_NETBSD
-+sources += topology-netbsd.c
-+ldflags += -lpthread
-+endif HWLOC_HAVE_NETBSD
-+
- if HWLOC_HAVE_FREEBSD
- sources += topology-freebsd.c
- endif HWLOC_HAVE_FREEBSD
diff --git a/parallel/hwloc/patches/patch-src_topology-netbsd.c b/parallel/hwloc/patches/patch-src_topology-netbsd.c
deleted file mode 100644
index 2e5ba2fa5be..00000000000
--- a/parallel/hwloc/patches/patch-src_topology-netbsd.c
+++ /dev/null
@@ -1,172 +0,0 @@
-$NetBSD: patch-src_topology-netbsd.c,v 1.2 2012/10/26 20:23:25 joerg Exp $
-
---- src/topology-netbsd.c.orig 2012-10-25 19:32:55.000000000 +0000
-+++ src/topology-netbsd.c
-@@ -0,0 +1,167 @@
-+/*
-+ * Copyright © 2012 Aleksej Saushev, The NetBSD Foundation
-+ * Copyright © 2009-2011 inria. All rights reserved.
-+ * Copyright © 2009-2010 Université Bordeaux 1
-+ * Copyright © 2011 Cisco Systems, Inc. All rights reserved.
-+ * See COPYING in top-level directory.
-+ */
-+
-+#define _NETBSD_SOURCE /* request "_np" functions */
-+
-+#include <private/autogen/config.h>
-+
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <inttypes.h>
-+#include <sys/param.h>
-+#include <pthread.h>
-+#include <sched.h>
-+
-+#include <hwloc.h>
-+#include <private/private.h>
-+#include <private/debug.h>
-+
-+/* #ifdef HAVE_SCHED_H */
-+static void
-+hwloc_netbsd_bsd2hwloc(hwloc_bitmap_t hwloc_cpuset, const cpuset_t *cpuset)
-+{
-+ unsigned cpu, cpulimit;
-+ hwloc_bitmap_zero(hwloc_cpuset);
-+ cpulimit = cpuset_size(cpuset) * CHAR_BIT;
-+ for (cpu = 0; cpu < cpulimit; cpu++)
-+ if (cpuset_isset(cpu, cpuset))
-+ hwloc_bitmap_set(hwloc_cpuset, cpu);
-+}
-+
-+static void
-+hwloc_netbsd_hwloc2bsd(hwloc_const_bitmap_t hwloc_cpuset, cpuset_t *cpuset)
-+{
-+ unsigned cpu, cpulimit;
-+ cpuset_zero(cpuset);
-+ cpulimit = cpuset_size(cpuset) * CHAR_BIT;
-+ for (cpu = 0; cpu < cpulimit; cpu++)
-+ if (hwloc_bitmap_isset(hwloc_cpuset, cpu))
-+ cpuset_set(cpu, cpuset);
-+}
-+
-+static int
-+hwloc_netbsd_set_proc_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_pid_t pid, hwloc_const_bitmap_t hwloc_cpuset, int flags __hwloc_attribute_unused)
-+{
-+ int status;
-+ cpuset_t *cpuset = cpuset_create();
-+
-+ hwloc_netbsd_hwloc2bsd(hwloc_cpuset, cpuset);
-+
-+ status = sched_setaffinity_np(pid, cpuset_size(cpuset), cpuset);
-+
-+ cpuset_destroy(cpuset);
-+ return status;
-+}
-+
-+static int
-+hwloc_netbsd_get_proc_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_pid_t pid, hwloc_bitmap_t hwloc_cpuset, int flags __hwloc_attribute_unused)
-+{
-+ int status;
-+ cpuset_t *cpuset = cpuset_create();
-+
-+ status = sched_setaffinity_np(pid, cpuset_size(cpuset), cpuset);
-+ hwloc_netbsd_bsd2hwloc(hwloc_cpuset, cpuset);
-+
-+ cpuset_destroy(cpuset);
-+ return status;
-+}
-+
-+
-+static int
-+hwloc_netbsd_set_thisproc_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_cpuset, int flags)
-+{
-+ return hwloc_netbsd_set_proc_cpubind(topology, 0, hwloc_cpuset, flags);
-+}
-+
-+static int
-+hwloc_netbsd_get_thisproc_cpubind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_cpuset, int flags)
-+{
-+ return hwloc_netbsd_get_proc_cpubind(topology, 0, hwloc_cpuset, flags);
-+}
-+
-+
-+static int
-+hwloc_netbsd_set_thread_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_thread_t tid, hwloc_const_bitmap_t hwloc_cpuset, int flags __hwloc_attribute_unused)
-+{
-+ int status;
-+ cpuset_t *cpuset = cpuset_create();
-+
-+ hwloc_netbsd_hwloc2bsd(hwloc_cpuset, cpuset);
-+
-+ status = pthread_setaffinity_np(tid, cpuset_size(cpuset), cpuset);
-+
-+ cpuset_destroy(cpuset);
-+
-+ if (status) {
-+ errno = status;
-+ return -1;
-+ }
-+
-+ return 0;
-+}
-+
-+static int
-+hwloc_netbsd_get_thread_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_thread_t tid, hwloc_bitmap_t hwloc_cpuset, int flags __hwloc_attribute_unused)
-+{
-+ int status;
-+ cpuset_t *cpuset = cpuset_create();
-+
-+ status = pthread_getaffinity_np(tid, cpuset_size(cpuset), cpuset);
-+
-+ hwloc_netbsd_bsd2hwloc(hwloc_cpuset, cpuset);
-+ cpuset_destroy(cpuset);
-+
-+ if (status) {
-+ errno = status;
-+ return -1;
-+ }
-+
-+ return 0;
-+}
-+
-+
-+static int
-+hwloc_netbsd_set_thisthread_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_cpuset, int flags)
-+{
-+ return hwloc_netbsd_set_thread_cpubind(topology, pthread_self(), hwloc_cpuset, flags);
-+}
-+
-+static int
-+hwloc_netbsd_get_thisthread_cpubind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_cpuset, int flags)
-+{
-+ return hwloc_netbsd_get_thread_cpubind(topology, pthread_self(), hwloc_cpuset, flags);
-+}
-+
-+void hwloc_set_netbsd_hooks(struct hwloc_topology *topology);
-+
-+void
-+hwloc_look_netbsd(struct hwloc_topology *topology)
-+{
-+ unsigned nbprocs = hwloc_fallback_nbprocessors(topology);
-+
-+ hwloc_set_netbsd_hooks(topology);
-+ hwloc_look_x86(topology, nbprocs);
-+
-+ hwloc_setup_pu_level(topology, nbprocs);
-+
-+ hwloc_obj_add_info(topology->levels[0][0], "Backend", "NetBSD");
-+}
-+
-+void
-+hwloc_set_netbsd_hooks(struct hwloc_topology *topology)
-+{
-+ topology->set_proc_cpubind = hwloc_netbsd_set_proc_cpubind;
-+ topology->get_proc_cpubind = hwloc_netbsd_get_proc_cpubind;
-+ topology->set_thisproc_cpubind = hwloc_netbsd_set_thisproc_cpubind;
-+ topology->get_thisproc_cpubind = hwloc_netbsd_get_thisproc_cpubind;
-+
-+ topology->set_thread_cpubind = hwloc_netbsd_set_thread_cpubind;
-+ topology->get_thread_cpubind = hwloc_netbsd_get_thread_cpubind;
-+ topology->set_thisthread_cpubind = hwloc_netbsd_set_thisthread_cpubind;
-+ topology->get_thisthread_cpubind = hwloc_netbsd_get_thisthread_cpubind;
-+}
diff --git a/parallel/hwloc/patches/patch-src_topology.c b/parallel/hwloc/patches/patch-src_topology.c
deleted file mode 100644
index 81f27bffbc2..00000000000
--- a/parallel/hwloc/patches/patch-src_topology.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_topology.c,v 1.1.1.1 2012/03/21 13:31:35 asau Exp $
-
---- src/topology.c.orig 2012-01-22 08:06:22.000000000 +0000
-+++ src/topology.c
-@@ -2168,6 +2168,11 @@ hwloc_discover(struct hwloc_topology *to
- hwloc_look_darwin(topology);
- # endif /* HWLOC_DARWIN_SYS */
-
-+# ifdef HWLOC_NETBSD_SYS
-+# define HAVE_OS_SUPPORT
-+ hwloc_look_netbsd(topology);
-+# endif /* HWLOC_NETBSD_SYS */
-+
- # ifdef HWLOC_FREEBSD_SYS
- # define HAVE_OS_SUPPORT
- hwloc_look_freebsd(topology);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 10:28:38 +0000