slurm, slurm-devel: Guard cpuset_destroy() with #ifdef __NetBSD__

[Jason Bacon <bacon4000%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Mon May 16 12:38:47 2016 -0500
Changeset:	87782beca59217fdc81e276b4bea1e7b4e1dd889

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

Log Message:
slurm, slurm-devel: Guard cpuset_destroy() with #ifdef __NetBSD__

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

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

diffstat:
 slurm-devel/distinfo                        | 2 +-
 slurm-devel/patches/patch-src_common_gres.c | 4 +++-
 slurm/distinfo                              | 2 +-
 slurm/patches/patch-src_common_gres.c       | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diffs:
diff --git a/slurm-devel/distinfo b/slurm-devel/distinfo
index b0605fe..9174a31 100644
--- a/slurm-devel/distinfo
+++ b/slurm-devel/distinfo
@@ -6,7 +6,7 @@ SHA512 (slurm-16.05.0-0rc2.tar.bz2) = 5cc31ec8d04d6319849300a6e8cc19618c559a2deb
 Size (slurm-16.05.0-0rc2.tar.bz2) = 5970434 bytes
 SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5
 SHA1 (patch-src_common_callerid.c) = a6d743542f2c46d17a94b2473be703be41c24664
-SHA1 (patch-src_common_gres.c) = 50cd691ca8e8bf41f28b35bda55f22a95bf6b962
+SHA1 (patch-src_common_gres.c) = 9f8ba8fd5a8c4000da5bca67ee7d3ff529e37e99
 SHA1 (patch-src_plugins_burst__buffer_common_burst__buffer__common.c) = b21a852722c26b955ae51d8615c9d22304650d32
 SHA1 (patch-src_plugins_power_common_power__common.c) = 7527e0655efe6ea0243cb3a9ff21814002bed5d9
 SHA1 (patch-src_plugins_switch_generic_switch__generic.c) = acf9bcc6f8a787770cd8553de520edef5bdbda4a
diff --git a/slurm-devel/patches/patch-src_common_gres.c b/slurm-devel/patches/patch-src_common_gres.c
index 1e1be4a..84965df 100644
--- a/slurm-devel/patches/patch-src_common_gres.c
+++ b/slurm-devel/patches/patch-src_common_gres.c
@@ -32,11 +32,13 @@ $NetBSD$
  	bitstr_t *usable_gres = NULL;
  	int i, i_last, rc;
  	ListIterator iter;
-@@ -5641,6 +5654,7 @@ static bitstr_t * _get_usable_gres(int c
+@@ -5641,6 +5654,9 @@ static bitstr_t * _get_usable_gres(int c
  		gres_inx += gres_slurmd_conf->count;
  	}
  	list_iterator_destroy(iter);
++#ifdef __NetBSD__
 +	cpuset_destroy(mask);
++#endif
  
  	return usable_gres;
  }
diff --git a/slurm/distinfo b/slurm/distinfo
index 26aa08e..35ebf07 100644
--- a/slurm/distinfo
+++ b/slurm/distinfo
@@ -6,7 +6,7 @@ SHA512 (slurm-15.08.11.tar.bz2) = f152893fc1c8f54120d886c81d1651545c79cc67606608
 Size (slurm-15.08.11.tar.bz2) = 5870156 bytes
 SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5
 SHA1 (patch-src_common_callerid.c) = a6d743542f2c46d17a94b2473be703be41c24664
-SHA1 (patch-src_common_gres.c) = 50cd691ca8e8bf41f28b35bda55f22a95bf6b962
+SHA1 (patch-src_common_gres.c) = 9f8ba8fd5a8c4000da5bca67ee7d3ff529e37e99
 SHA1 (patch-src_plugins_burst__buffer_common_burst__buffer__common.c) = b21a852722c26b955ae51d8615c9d22304650d32
 SHA1 (patch-src_plugins_power_common_power__common.c) = 7527e0655efe6ea0243cb3a9ff21814002bed5d9
 SHA1 (patch-src_plugins_switch_generic_switch__generic.c) = acf9bcc6f8a787770cd8553de520edef5bdbda4a
diff --git a/slurm/patches/patch-src_common_gres.c b/slurm/patches/patch-src_common_gres.c
index 1e1be4a..84965df 100644
--- a/slurm/patches/patch-src_common_gres.c
+++ b/slurm/patches/patch-src_common_gres.c
@@ -32,11 +32,13 @@ $NetBSD$
  	bitstr_t *usable_gres = NULL;
  	int i, i_last, rc;
  	ListIterator iter;
-@@ -5641,6 +5654,7 @@ static bitstr_t * _get_usable_gres(int c
+@@ -5641,6 +5654,9 @@ static bitstr_t * _get_usable_gres(int c
  		gres_inx += gres_slurmd_conf->count;
  	}
  	list_iterator_destroy(iter);
++#ifdef __NetBSD__
 +	cpuset_destroy(mask);
++#endif
  
  	return usable_gres;
  }