diff options
| author | dmcmahill <dmcmahill> | 2004-05-19 06:53:38 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2004-05-19 06:53:38 +0000 |
| commit | dddf8d62fcb16c0a8062d625d7ca7a89350ed2f0 (patch) | |
| tree | 912b90b69d93387d9a0593f3dda30a25b805212b | |
| parent | dc30de0de3cca2def00fafbb87c3057f17f32f9b (diff) | |
| download | pkgsrc-dddf8d62fcb16c0a8062d625d7ca7a89350ed2f0.tar.gz | |
make sure we use MACHINE_ARCH (uname -p) instead of MACHINE (uname -m) for
setting the SGE arch. Should fix x86_64 (amd64) as well as others that have
a different MACHINE and MACHINE_ARCH. Noted on the SGE developers list
by Nicolas Joly
| -rw-r--r-- | parallel/sge/distinfo | 4 | ||||
| -rw-r--r-- | parallel/sge/patches/patch-as | 32 |
2 files changed, 19 insertions, 17 deletions
diff --git a/parallel/sge/distinfo b/parallel/sge/distinfo index 1d692d60501..1adaf94420b 100644 --- a/parallel/sge/distinfo +++ b/parallel/sge/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/05/03 00:38:34 dmcmahill Exp $ +$NetBSD: distinfo,v 1.2 2004/05/19 06:53:38 dmcmahill Exp $ SHA1 (sge-5.3p6.tar.gz) = be0ff4ea59d14a1186e5fd35987df6f15fbc21fe Size (sge-5.3p6.tar.gz) = 9388452 bytes @@ -20,7 +20,7 @@ SHA1 (patch-ao) = 22788540ea416f8630f4e423775f28abc2941eec SHA1 (patch-ap) = 97f14b5c2469b977806458aa670f2fdbfdc38476 SHA1 (patch-aq) = 1d2bd0d16a4e8bb7e614f6e8bef8b9205da24e71 SHA1 (patch-ar) = ecf6259d9f4eb91f84fa86ea3853cde64b746088 -SHA1 (patch-as) = 114dad61ed17d0668303c472a42b049691fa1664 +SHA1 (patch-as) = db661826d8128b9a5def81a39cb7e0688a320198 SHA1 (patch-at) = 502b66d687afebb9d945c1664e11978986be0fbc SHA1 (patch-au) = cec0609d9239ecc9749249145851ad4f637db38a SHA1 (patch-av) = da8392761b8c9cfdc0c82f3d3df7edf73584c59e diff --git a/parallel/sge/patches/patch-as b/parallel/sge/patches/patch-as index 5050c0bc50f..119807c4c17 100644 --- a/parallel/sge/patches/patch-as +++ b/parallel/sge/patches/patch-as @@ -1,26 +1,28 @@ -$NetBSD: patch-as,v 1.1.1.1 2004/05/03 00:38:35 dmcmahill Exp $ +$NetBSD: patch-as,v 1.2 2004/05/19 06:53:38 dmcmahill Exp $ ---- source/dist/util/arch 2003-10-02 14:25:34.000000000 +0200 -+++ source/dist/util/arch 2003-09-30 15:53:29.000000000 +0200 -@@ -63,6 +63,9 @@ - FreeBSD,*) +--- source/dist/util/arch.orig Thu Apr 22 13:41:08 2004 ++++ source/dist/util/arch Wed May 19 06:37:17 2004 +@@ -56,4 +56,5 @@ + os="`/usr/bin/uname -s`" + ht="`/usr/bin/uname -m`" ++ ha="`/usr/bin/uname -p`" + osht="$os,$ht" + case $osht in +@@ -64,4 +65,7 @@ ARCH=fbsd-$ht ;; + NetBSD,*) -+ ARCH=nbsd-$ht ++ ARCH=nbsd-$ha + ;; esac fi - -@@ -267,6 +270,11 @@ +@@ -272,4 +276,9 @@ + PATH=$OLD_PATH DEFAULTMANPATH=`/usr/bin/manpath -q` - PATH=$SAFE_PATH - ;; ++ PATH=$SAFE_PATH ++ ;; + nbsd-*) + PATH=$OLD_PATH + DEFAULTMANPATH=/usr/pkg/man:/usr/local/man:/usr/X11R6/man:/usr/share/man -+ PATH=$SAFE_PATH -+ ;; - darwin) - DEFAULTMANPATH=`/usr/bin/manpath -q` - SHARED_LIBRARY_PATH="DYLD_LIBRARY_PATH" + PATH=$SAFE_PATH + ;; |