summaryrefslogtreecommitdiff
path: root/parallel
diff options
context:
space:
mode:
authorjoerg <joerg>2012-10-26 20:23:25 +0000
committerjoerg <joerg>2012-10-26 20:23:25 +0000
commitdf7af2ef2ab10fd0c8b38739a81b2ac5257ac0a9 (patch)
tree3a5f7b345b5e0016ec63cdc21d217928cc21f914 /parallel
parentf2ba2bd31c919fc34ab8ffc90c03b338c6c674cc (diff)
downloadpkgsrc-df7af2ef2ab10fd0c8b38739a81b2ac5257ac0a9.tar.gz
Avoid conflicting implicit prototype.
Diffstat (limited to 'parallel')
-rw-r--r--parallel/hwloc/distinfo4
-rw-r--r--parallel/hwloc/patches/patch-src_topology-netbsd.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/parallel/hwloc/distinfo b/parallel/hwloc/distinfo
index 8e49a0ae49d..1b6ac8efb4f 100644
--- a/parallel/hwloc/distinfo
+++ b/parallel/hwloc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2012/10/17 03:11:44 asau Exp $
+$NetBSD: distinfo,v 1.4 2012/10/26 20:23:25 joerg Exp $
SHA1 (hwloc-1.5.tar.gz) = 0ff8c81481987627dc21b3ed826caaefc94d4d0f
RMD160 (hwloc-1.5.tar.gz) = eb9a055db25561a8d8aa35c6a54f9787ee3839ed
@@ -6,5 +6,5 @@ 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) = aa5729b8e10326f6e30aaab40bf5368955a66733
+SHA1 (patch-src_topology-netbsd.c) = fdce87839e7215664d783bace5aac29f8a835bd2
SHA1 (patch-src_topology.c) = 4e7bdac212a96c51e4464bed05f2ac54bc6f5a53
diff --git a/parallel/hwloc/patches/patch-src_topology-netbsd.c b/parallel/hwloc/patches/patch-src_topology-netbsd.c
index 04bdbe3853a..2e5ba2fa5be 100644
--- a/parallel/hwloc/patches/patch-src_topology-netbsd.c
+++ b/parallel/hwloc/patches/patch-src_topology-netbsd.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_topology-netbsd.c,v 1.1.1.1 2012/03/21 13:31:35 asau Exp $
+$NetBSD: patch-src_topology-netbsd.c,v 1.2 2012/10/26 20:23:25 joerg Exp $
---- src/topology-netbsd.c.orig 2012-03-21 11:13:38.000000000 +0000
+--- src/topology-netbsd.c.orig 2012-10-25 19:32:55.000000000 +0000
+++ src/topology-netbsd.c
-@@ -0,0 +1,166 @@
+@@ -0,0 +1,167 @@
+/*
+ * Copyright © 2012 Aleksej Saushev, The NetBSD Foundation
+ * Copyright © 2009-2011 inria. All rights reserved.
@@ -142,6 +142,7 @@ $NetBSD: patch-src_topology-netbsd.c,v 1.1.1.1 2012/03/21 13:31:35 asau Exp $
+ 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)