From 53a4c1b0e778998149dc3d16c593a77415e546c7 Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 24 Mar 1999 23:53:08 +0000 Subject: [PATCH] fix compiling on i386 --- security/SSLeay/Makefile | 10 ++++++---- security/SSLeay/patches/patch-aa | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/security/SSLeay/Makefile b/security/SSLeay/Makefile index 4cd7a030ac3..c8e64583bc4 100644 --- a/security/SSLeay/Makefile +++ b/security/SSLeay/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 1999/03/12 20:45:09 brad Exp $ +# $OpenBSD: Makefile,v 1.5 1999/03/24 23:53:08 brad Exp $ DISTNAME= SSLeay-0.9.0b CATEGORIES= security @@ -49,10 +49,12 @@ CONFIGURE_ARGS+= -I../../rsaref/ -DRSAref # gcc-2.8.* confuses DES names? destest fails, but not with gcc-2.7.*. fix. CONFIGURE_ARGS+= -DPERL5 -.if (${MACHINE_ARCH} == "i386") -CONFIGURE_ARGS+= OpenBSD-x86 -.elif (${MACHINE_ARCH} == "sparc") +.if (${MACHINE_ARCH} == "sparc") CONFIGURE_ARGS+= OpenBSD-sparc +.elif (${MACHINE_ARCH} == "i386") +CONFIGURE_ARGS+= OpenBSD-x86 +.elif (${MACHINE_ARCH} == "m68k") +CONFIGURE_ARGS+= OpenBSD-m68k .elif (${MACHINE_ARCH} == "alpha") CONFIGURE_ARGS+= alpha-gcc .else diff --git a/security/SSLeay/patches/patch-aa b/security/SSLeay/patches/patch-aa index b4ccef6b0e4..1c5b7a44970 100644 --- a/security/SSLeay/patches/patch-aa +++ b/security/SSLeay/patches/patch-aa @@ -1,15 +1,16 @@ --- Configure.orig Fri Jun 26 04:25:25 1998 -+++ Configure Fri Mar 12 13:10:01 1999 -@@ -133,6 +133,8 @@ ++++ Configure Wed Mar 24 18:19:32 1999 +@@ -133,6 +133,9 @@ "NetBSD-m86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", "NetBSD-x86", "gcc:-DTERMIOS -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:", "FreeBSD", "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", -+"OpenBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", -+"OpenBSD-x86", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:asm/x86-lnxa.o:asm/dx86-out.o asm/cx86-out.o:asm/bx86-out.o", ++"OpenBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", ++"OpenBSD-m68k", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", ++"OpenBSD-x86", "gcc:-DTERMIOS -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:", #"bsdi-gcc", "gcc:-O3 -ffast-math -DBN_ASM -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm", "nextstep", "cc:-O3 -Wall -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:::", # NCR MP-RAS UNIX ver 02.03.01 -@@ -221,13 +223,13 @@ +@@ -221,13 +224,13 @@ { $libs.=$_." "; }