From 3c292cd23e0733da6b1939385709dbd9868e65cb Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Tue, 15 Jun 2004 00:26:07 +0000 Subject: add some patches for 64 bit systems from Nicolas Joly --- parallel/sge/distinfo | 6 +++-- parallel/sge/patches/patch-ar | 11 +++++--- parallel/sge/patches/patch-bg | 58 +++++++++++++++++++++++++++++++++++++++++++ parallel/sge/patches/patch-bh | 22 ++++++++++++++++ 4 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 parallel/sge/patches/patch-bg create mode 100644 parallel/sge/patches/patch-bh (limited to 'parallel') diff --git a/parallel/sge/distinfo b/parallel/sge/distinfo index 1adaf94420b..88f98b91426 100644 --- a/parallel/sge/distinfo +++ b/parallel/sge/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2004/05/19 06:53:38 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3 2004/06/15 00:26:07 dmcmahill Exp $ SHA1 (sge-5.3p6.tar.gz) = be0ff4ea59d14a1186e5fd35987df6f15fbc21fe Size (sge-5.3p6.tar.gz) = 9388452 bytes @@ -19,7 +19,7 @@ SHA1 (patch-an) = a7b3738d0bb6893215300608c096156b5c94b3a4 SHA1 (patch-ao) = 22788540ea416f8630f4e423775f28abc2941eec SHA1 (patch-ap) = 97f14b5c2469b977806458aa670f2fdbfdc38476 SHA1 (patch-aq) = 1d2bd0d16a4e8bb7e614f6e8bef8b9205da24e71 -SHA1 (patch-ar) = ecf6259d9f4eb91f84fa86ea3853cde64b746088 +SHA1 (patch-ar) = 638ae1050707d999154e87038b791178db64a243 SHA1 (patch-as) = db661826d8128b9a5def81a39cb7e0688a320198 SHA1 (patch-at) = 502b66d687afebb9d945c1664e11978986be0fbc SHA1 (patch-au) = cec0609d9239ecc9749249145851ad4f637db38a @@ -34,3 +34,5 @@ SHA1 (patch-bc) = ff0d2bb7faa8ece9fad0a1bb9dab3a47fcdce5b4 SHA1 (patch-bd) = cfdbe67062bd4d08ce499c13f449b3a60f3e297b SHA1 (patch-be) = b195148431d2225abe937934608959d94dd9b10a SHA1 (patch-bf) = 65c9d44a435802be2c209260bbd5c78c60560298 +SHA1 (patch-bg) = d0d25bafcfd3ac60f21c82df51648811bd6b9b64 +SHA1 (patch-bh) = cbe5e126b8cff831361c0cc6957e1c282d0d2aa7 diff --git a/parallel/sge/patches/patch-ar b/parallel/sge/patches/patch-ar index 9dbef91552a..e7540913883 100644 --- a/parallel/sge/patches/patch-ar +++ b/parallel/sge/patches/patch-ar @@ -1,6 +1,6 @@ -$NetBSD: patch-ar,v 1.1.1.1 2004/05/03 00:38:35 dmcmahill Exp $ +$NetBSD: patch-ar,v 1.2 2004/06/15 00:26:07 dmcmahill Exp $ ---- source/daemons/shepherd/setrlimits.c.orig 2004-03-03 13:10:00.000000000 +0000 +--- source/daemons/shepherd/setrlimits.c.orig Wed Mar 3 13:10:00 2004 +++ source/daemons/shepherd/setrlimits.c @@ -34,7 +34,7 @@ #include @@ -11,9 +11,12 @@ $NetBSD: patch-ar,v 1.1.1.1 2004/05/03 00:38:35 dmcmahill Exp $ # include #endif -@@ -406,7 +406,7 @@ int trace_rlimit +@@ -404,9 +404,9 @@ int trace_rlimit + if (rlp->rlim_max < rlp->rlim_cur) + rlp->rlim_cur = rlp->rlim_max; - #if defined(ALINUX) || defined(LINUX5) || ( defined(SOLARIS) && !defined(SOLARIS64) ) || defined(NECSX4) || defined(NECSX5) +-#if defined(ALINUX) || defined(LINUX5) || ( defined(SOLARIS) && !defined(SOLARIS64) ) || defined(NECSX4) || defined(NECSX5) ++#if defined(ALINUX) || defined(LINUX5) || ( defined(SOLARIS) && !defined(SOLARIS64) ) || defined(NECSX4) || defined(NECSX5) || defined(NETBSD_ALPHA) || defined(NETBSD_X86_64) || defined(NETBSD_SPARC64) # define limit_fmt "%ld" -#elif defined(LINUX6) || defined(IRIX6) || defined(HP11) || defined(HP10) || defined(DARWIN) || defined(FREEBSD) +#elif defined(LINUX6) || defined(IRIX6) || defined(HP11) || defined(HP10) || defined(DARWIN) || defined(FREEBSD) || defined(NETBSD) diff --git a/parallel/sge/patches/patch-bg b/parallel/sge/patches/patch-bg new file mode 100644 index 00000000000..5b6f8e36b89 --- /dev/null +++ b/parallel/sge/patches/patch-bg @@ -0,0 +1,58 @@ +$NetBSD: patch-bg,v 1.1 2004/06/15 00:26:07 dmcmahill Exp $ + +--- source/common/basis_types.h.orig Wed Mar 3 13:09:42 2004 ++++ source/common/basis_types.h +@@ -52,7 +52,7 @@ + + + +-#if defined(FREEBSD) ++#if defined(FREEBSD) || defined(NETBSD) + # define U32CFormat "%u" + # define u32c(x) (unsigned int)(x) + +@@ -92,7 +92,7 @@ extern "C" { + # define u_long32 u_int + #elif defined(WIN32NATIVE) + # define u_long32 unsigned long +-#elif defined(FREEBSD) ++#elif defined(FREEBSD) || defined(NETBSD) + # define u_long32 uint32_t + #else + # define u_long32 u_long +@@ -100,7 +100,7 @@ extern "C" { + + /* set u32 and x32 for 64 or 32 bit machines */ + /* uu32 for strictly unsigned, not nice, but did I use %d for an unsigned? */ +-#if defined(ALPHA) || defined(IRIX6) || defined(CRAY) || defined(SOLARIS64) || defined(NECSX4) || defined(NECSX5) || defined(ALINUX) || defined(IA64LINUX) || defined(LINUXAMD64) ||defined(FREEBSD) ++#if defined(ALPHA) || defined(IRIX6) || defined(CRAY) || defined(SOLARIS64) || defined(NECSX4) || defined(NECSX5) || defined(ALINUX) || defined(IA64LINUX) || defined(LINUXAMD64) ||defined(FREEBSD) || defined(NETBSD) + # define u32 "%d" + # define uu32 "%u" + # define x32 "%x" +@@ -116,7 +116,7 @@ extern "C" { + solaris (who else - it's IRIX?) uses long + variables for uid_t, gid_t and pid_t + */ +-#if defined(FREEBSD) ++#if defined(FREEBSD) || defined(NETBSD) + # define uid_t_fmt "%u" + #else + # define uid_t_fmt pid_t_fmt +@@ -132,7 +132,7 @@ extern "C" { + # define gid_t_fmt "%ld" + #elif defined(LINUX5) + # define gid_t_fmt "%hu" +-#elif defined(LINUX6) || defined(FREEBSD) ++#elif defined(LINUX6) || defined(FREEBSD) || defined(NETBSD) + # define gid_t_fmt "%u" + #else + # define gid_t_fmt "%d" +@@ -185,7 +185,7 @@ typedef char stringTlong[4*MAX_STRING_SI + #define SN_UNLIMITED "%s" + + /* used for shepherd and procfs */ +-#if defined(LINUX) || defined(SUN4) || defined(AIX4) || defined(HP10) || defined(HP11) || defined(FREEBSD) ++#if defined(LINUX) || defined(SUN4) || defined(AIX4) || defined(HP10) || defined(HP11) || defined(FREEBSD) || defined(NETBSD) + # define MAX_GROUPS NGROUPS + #elif defined(IRIX6) || defined(SOLARIS) + # define MAX_GROUPS NGROUPS_UMAX diff --git a/parallel/sge/patches/patch-bh b/parallel/sge/patches/patch-bh new file mode 100644 index 00000000000..d0fdfa7530c --- /dev/null +++ b/parallel/sge/patches/patch-bh @@ -0,0 +1,22 @@ +$NetBSD: patch-bh,v 1.1 2004/06/15 00:26:07 dmcmahill Exp $ + +--- source/daemons/common/pdc.c.orig Wed Mar 3 13:09:47 2004 ++++ source/daemons/common/pdc.c +@@ -117,7 +117,7 @@ int main(int argc,char *argv[]) + #include "sge_stat.h" + #endif + +-#if defined(LINUX) || defined(ALPHA) || defined(IRIX6) || defined(SOLARIS) || defined(FREEBSD) || defined(DARWIN) ++#if defined(LINUX) || defined(ALPHA) || defined(IRIX6) || defined(SOLARIS) || defined(FREEBSD) || defined (NETBSD) || defined(DARWIN) + #include "sge_nprocs.h" + #endif + +@@ -2082,7 +2082,7 @@ int psStartCollector(void) + pagesize = getpagesize(); + + /* retrieve static parameters */ +-#if defined(LINUX) || defined(ALINUX) || defined(IRIX6) || defined(SOLARIS) || defined(FREEBSD) || defined(DARWIN) ++#if defined(LINUX) || defined(ALINUX) || defined(IRIX6) || defined(SOLARIS) || defined(FREEBSD) || defined (NETBSD) || defined(DARWIN) + ncpus = sge_nprocs(); + #elif defined(ALPHA) + { -- cgit v1.2.3