pkgsrc-WIP-changes archive

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

Remove obsolete patch from task.c



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Mon May 16 09:30:23 2016 -0500
Changeset:	afd556d22140af7e26d7884d17f43186f03114ca

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

Log Message:
Remove obsolete patch from task.c

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

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

diffstat:
 slurm/patches/patch-src_slurmd_slurmstepd_task.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diffs:
diff --git a/slurm/patches/patch-src_slurmd_slurmstepd_task.c b/slurm/patches/patch-src_slurmd_slurmstepd_task.c
index 9d0a372..831091c 100644
--- a/slurm/patches/patch-src_slurmd_slurmstepd_task.c
+++ b/slurm/patches/patch-src_slurmd_slurmstepd_task.c
@@ -1,10 +1,8 @@
-$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.2 2015/04/20 13:08:37 outpaddling Exp $
+$NetBSD$
 
-# Hack for Linux compat
-
---- src/slurmd/slurmstepd/task.c.orig	2015-03-19 19:38:01.000000000 +0000
+--- src/slurmd/slurmstepd/task.c.orig	2016-05-03 22:41:59.000000000 +0000
 +++ src/slurmd/slurmstepd/task.c
-@@ -540,6 +540,17 @@ _make_tmpdir(stepd_step_rec_t *job)
+@@ -558,6 +558,18 @@ _make_tmpdir(stepd_step_rec_t *job)
  		 * still work with older systems we include this check.
  		 */
  
@@ -14,10 +12,11 @@ $NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.2 2015/04/20 13:08:37 outpaddlin
 +#define HAVE_EACCESS 1
 +#endif
 +  
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#define __GLIBC__               (1) 
-+#define __GLIBC_PREREQ(a,b)     (1) 
-+#endif
++// Unsure about the reason for this patch, but it dates back to SLURM 2.6.4
++//#if defined(__FreeBSD__) || defined(__NetBSD__)
++//#define __GLIBC__               (1) 
++//#define __GLIBC_PREREQ(a,b)     (1) 
++//#endif
 +
  #if defined(HAVE_FACCESSAT)
  		else if (faccessat(AT_FDCWD, tmpdir, X_OK|W_OK, AT_EACCESS))


Home | Main Index | Thread Index | Old Index