Fix so own copy of gmp compiles correctly on i386 with ELF.

3 files changed, 59 insertions, 17 deletions

diff --git a/security/ssh/files/patch-sum b/security/ssh/files/patch-sum
index dd02cf49abb..ea26bdf9309 100644
--- a/security/ssh/files/patch-sum
+++ b/security/ssh/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/07/13 13:27:58 itojun Exp $
+$NetBSD: patch-sum,v 1.3 1999/07/17 03:41:06 jlam Exp $
 
 MD5 (patch-aa) = dca3a23f5066125131e34fba33baa4ae
 MD5 (patch-ab) = 712a7ffc9d2686153df92e32ce6b43bb
@@ -8,10 +8,10 @@ MD5 (patch-ae) = e654824aa0394aa47d474011902411a9
 MD5 (patch-af) = 577e03bb92268c10b74ae3e60caf9147
 MD5 (patch-aj) = f6d02ebe8508202660d77c04b7aeeba2
 MD5 (patch-al) = 0cb4bff88a26d1a09e0669b5879b91f7
-MD5 (patch-am) = 1e2c988835981ea4c36fd9f2de42dd29
+MD5 (patch-am) = fd4e766e57c58645714fdab8ed55da5d
 MD5 (patch-an) = 135b09a36c66aaf25a476dcb659efcf7
 MD5 (patch-ao) = 98e2eb418ee7f5ad544c32c7d5569ea2
-MD5 (patch-ap) = 1afd7f89dc747aabc4337dcc632f613b
+MD5 (patch-ap) = 99049fb6deb9bab8950723b7430a89a4
 MD5 (patch-aq) = fed44f408b8f42c808af1f896308d07d
 MD5 (patch-au) = aabad95304cea849e30389ad00e6d243
 MD5 (patch-av) = b3f9909bd6a5cc387e929d16f89884c0
diff --git a/security/ssh/patches/patch-am b/security/ssh/patches/patch-am
index 04eee58f5a3..853a1d085a3 100644
--- a/security/ssh/patches/patch-am
+++ b/security/ssh/patches/patch-am
@@ -1,15 +1,36 @@
-$NetBSD: patch-am,v 1.2 1999/05/10 21:34:46 tron Exp $
+$NetBSD: patch-am,v 1.3 1999/07/17 03:41:07 jlam Exp $
 
---- gmp-2.0.2-ssh-2/configure.in.orig	Mon Apr 26 19:50:09 1999
-+++ gmp-2.0.2-ssh-2/configure.in	Mon Apr 26 20:06:07 1999
-@@ -222,6 +222,10 @@
+--- gmp-2.0.2-ssh-2/configure.in.orig	Mon Feb 22 01:59:06 1999
++++ gmp-2.0.2-ssh-2/configure.in	Fri Jul 16 17:38:35 1999
+@@ -122,6 +122,20 @@
+     path="x86"
+     syntax_alternatives="$syntax_alternatives ELF_SYNTAX BSD_SYNTAX INTEL_SYNTAX"
+     ;;
++  i[3456]86*-*-*netbsd* | pentium-*-*netbsd* | pentiumpro-*-*netbsd*)
++    if $CC -E - -dM </dev/null | grep -q __ELF__; then
++      syntax_alternatives="$syntax_alternatives ELF_SYNTAX"     # ELF
++    else
++      syntax_alternatives="$syntax_alternatives BSD_SYNTAX"     # a.out
++      x86_broken_align=yes
++    fi
++    case "${host}" in
++      i[34]86*-*-*netbsd*)
++        path="x86" ;;
++      i[56]86*-*-*netbsd* | pentium-*-*netbsd* | pentiumpro-*-*netbsd*)
++        path="x86/pentium x86" ;;
++    esac
++    ;;
+   i[34]86*-*-linuxaout* | i[34]86*-*-linuxoldld* | \
+   i[34]86*-*-*bsd*)         # 386/486 running BSD or Linux with a.out
+     path="x86"
+@@ -221,6 +235,10 @@
+     ;;
    sh2-*-*)
      path="sh/sh2 sh"
-     ;;
++    ;;
 +  mips*-*-netbsd*)
 +    path="mips2"
 +    SFLAGS="-Wa,-KPIC"
-+    ;;
+     ;;
    mips[34]*-*-*)
      path="mips3"
-     ;;
diff --git a/security/ssh/patches/patch-ap b/security/ssh/patches/patch-ap
index dd43922900c..eb5397be923 100644
--- a/security/ssh/patches/patch-ap
+++ b/security/ssh/patches/patch-ap
@@ -1,15 +1,36 @@
-$NetBSD: patch-ap,v 1.2 1999/05/10 21:34:47 tron Exp $
+$NetBSD: patch-ap,v 1.3 1999/07/17 03:41:07 jlam Exp $
 
---- gmp-2.0.2-ssh-2/configure.orig	Thu Jul  9 02:40:44 1998
-+++ gmp-2.0.2-ssh-2/configure	Mon Apr 26 20:06:12 1999
-@@ -1955,6 +1955,10 @@
+--- gmp-2.0.2-ssh-2/configure.orig	Wed May 12 07:19:35 1999
++++ gmp-2.0.2-ssh-2/configure	Fri Jul 16 17:38:30 1999
+@@ -1855,6 +1855,20 @@
+     path="x86"
+     syntax_alternatives="$syntax_alternatives ELF_SYNTAX BSD_SYNTAX INTEL_SYNTAX"
+     ;;
++  i[3456]86*-*-*netbsd* | pentium-*-*netbsd* | pentiumpro-*-*netbsd*)
++    if $CC -E - -dM </dev/null | grep -q __ELF__; then
++      syntax_alternatives="$syntax_alternatives ELF_SYNTAX"	# ELF
++    else
++      syntax_alternatives="$syntax_alternatives BSD_SYNTAX"	# a.out
++      x86_broken_align=yes
++    fi
++    case "${host}" in
++      i[34]86*-*-*netbsd*)
++        path="x86" ;;
++      i[56]86*-*-*netbsd* | pentium-*-*netbsd* | pentiumpro-*-*netbsd*)
++        path="x86/pentium x86" ;;
++    esac
++    ;;
+   i[34]86*-*-linuxaout* | i[34]86*-*-linuxoldld* | \
+   i[34]86*-*-*bsd*)         # 386/486 running BSD or Linux with a.out
+     path="x86"
+@@ -1954,6 +1968,10 @@
+     ;;
    sh2-*-*)
      path="sh/sh2 sh"
-     ;;
++    ;;
 +  mips*-*-netbsd*)
 +    path="mips2"
 +    SFLAGS="-Wa,-KPIC"
-+    ;;
+     ;;
    mips[34]*-*-*)
      path="mips3"
-     ;;