pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Hacks to get gres.c compiling



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Fri May 13 21:15:53 2016 -0500
Changeset:	d72e3cdf5cc806bb49d4f195ec63f5e3780636a1

Modified Files:
	slurm/patches/patch-src_common_gres.c

Log Message:
Hacks to get gres.c compiling

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d72e3cdf5cc806bb49d4f195ec63f5e3780636a1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 slurm/patches/patch-src_common_gres.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diffs:
diff --git a/slurm/patches/patch-src_common_gres.c b/slurm/patches/patch-src_common_gres.c
index 9df1e61..583669d 100644
--- a/slurm/patches/patch-src_common_gres.c
+++ b/slurm/patches/patch-src_common_gres.c
@@ -2,16 +2,22 @@ $NetBSD$
 
 --- gres.c.orig	2016-05-03 22:41:59.000000000 +0000
 +++ gres.c
-@@ -79,6 +79,14 @@ typedef cpuset_t cpu_set_t;
+@@ -79,6 +79,20 @@ typedef cpuset_t cpu_set_t;
  #include <sys/stat.h>
  #include <math.h>
  
 +#ifdef __NetBSD__
-+typedef cpuset_t cpu_set_t;
 +#define	CPU_ZERO(p) cpuset_zero((p))
 +#define CPU_ISSET(i,c) cpuset_isset((i),(c))
 +#define sched_getaffinity sched_getaffinity_np
 +#define SCHED_GETAFFINITY_THREE_ARGS
++
++// http://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/common/lib/libc/sys/cpuset.c
++struct _cpuset {
++	uint32_t	bits[0];
++};
++
++typedef cpuset_t cpu_set_t;
 +#endif
 +
  #include "slurm/slurm.h"


Home | Main Index | Thread Index | Old Index