diff options
| author | hugh <> | 2000-10-13 21:31:30 +0000 |
|---|---|---|
| committer | hugh <> | 2000-10-13 21:31:30 +0000 |
| commit | b91c89ed7f50614027e76c49b85c79f51cb408a1 (patch) | |
| tree | 79aee5fdeaf8f25cba27d9299a128605f5910a8a | |
| parent | 04199a0ac8d5e64a4c04d30cd9eb933f7eb99648 (diff) | |
| download | openbsd-b91c89ed7f50614027e76c49b85c79f51cb408a1.tar.gz openbsd-b91c89ed7f50614027e76c49b85c79f51cb408a1.tar.bz2 openbsd-b91c89ed7f50614027e76c49b85c79f51cb408a1.zip | |
vax support; checked by beck.
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | src/lib/libssl/crypto-patent/Makefile | 4 | ||||
| -rw-r--r-- | src/lib/libssl/crypto/Makefile | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/Configure | 1 | ||||
| -rw-r--r-- | src/lib/libssl/src/config | 1 | ||||
| -rw-r--r-- | src/lib/libssl/ssl-patent/Makefile | 4 | ||||
| -rw-r--r-- | src/lib/libssl/ssl/Makefile | 4 |
7 files changed, 23 insertions, 1 deletions
diff --git a/src/lib/libssl/Makefile.bsd-wrapper b/src/lib/libssl/Makefile.bsd-wrapper index f59a2ea551..c208db032c 100644 --- a/src/lib/libssl/Makefile.bsd-wrapper +++ b/src/lib/libssl/Makefile.bsd-wrapper | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Build wrapper for OpenSSL | 1 | # Build wrapper for OpenSSL |
| 2 | # $OpenBSD: Makefile.bsd-wrapper,v 1.23 2000/09/05 08:18:21 deraadt Exp $ | 2 | # $OpenBSD: Makefile.bsd-wrapper,v 1.24 2000/10/13 21:31:28 hugh Exp $ |
| 3 | 3 | ||
| 4 | # Our lndir is hacked; specify a full path to avoid potential conflicts | 4 | # Our lndir is hacked; specify a full path to avoid potential conflicts |
| 5 | # with the one installed with X11. | 5 | # with the one installed with X11. |
| @@ -17,6 +17,9 @@ SSLCONF= --openssldir=/etc/ssl OpenBSD-mips | |||
| 17 | .if ${MACHINE_ARCH} == "alpha" | 17 | .if ${MACHINE_ARCH} == "alpha" |
| 18 | SSLCONF= --openssldir=/etc/ssl OpenBSD-alpha | 18 | SSLCONF= --openssldir=/etc/ssl OpenBSD-alpha |
| 19 | .else | 19 | .else |
| 20 | .if ${MACHINE_ARCH} == "vax" | ||
| 21 | SSLCONF= --openssldir=/etc/ssl OpenBSD-vax | ||
| 22 | .else | ||
| 20 | .if ${MACHINE_ARCH} == "sparc" | 23 | .if ${MACHINE_ARCH} == "sparc" |
| 21 | SSLCONF= --openssldir=/etc/ssl OpenBSD | 24 | SSLCONF= --openssldir=/etc/ssl OpenBSD |
| 22 | .else | 25 | .else |
| @@ -30,6 +33,7 @@ SSLCONF= --openssldir=/etc/ssl OpenBSD | |||
| 30 | .endif | 33 | .endif |
| 31 | .endif | 34 | .endif |
| 32 | .endif | 35 | .endif |
| 36 | .endif | ||
| 33 | 37 | ||
| 34 | MUNGEDFILES = ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/Makefile ${.OBJDIR}/${SSL_SRC}/apps/der_chop ${.OBJDIR}/${SSL_SRC}/tools/c_rehash | 38 | MUNGEDFILES = ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/Makefile ${.OBJDIR}/${SSL_SRC}/apps/der_chop ${.OBJDIR}/${SSL_SRC}/tools/c_rehash |
| 35 | 39 | ||
diff --git a/src/lib/libssl/crypto-patent/Makefile b/src/lib/libssl/crypto-patent/Makefile index d5757a1292..24acd06b17 100644 --- a/src/lib/libssl/crypto-patent/Makefile +++ b/src/lib/libssl/crypto-patent/Makefile | |||
| @@ -12,12 +12,16 @@ CFLAGS+= -DL_ENDIAN -DBN_ASM | |||
| 12 | .if ${MACHINE_ARCH} == "mips" | 12 | .if ${MACHINE_ARCH} == "mips" |
| 13 | CFLAGS+= -DL_ENDIAN | 13 | CFLAGS+= -DL_ENDIAN |
| 14 | .else | 14 | .else |
| 15 | .if ${MACHINE_ARCH} == "vax" | ||
| 16 | CFLAGS+= -DL_ENDIAN | ||
| 17 | .else | ||
| 15 | .if ${MACHINE_ARCH} == "alpha" | 18 | .if ${MACHINE_ARCH} == "alpha" |
| 16 | # no ENDIAN stuff defined for alpha | 19 | # no ENDIAN stuff defined for alpha |
| 17 | .else | 20 | .else |
| 18 | CFLAGS+= -DB_ENDIAN | 21 | CFLAGS+= -DB_ENDIAN |
| 19 | .endif | 22 | .endif |
| 20 | .endif | 23 | .endif |
| 24 | .endif | ||
| 21 | .endif | 25 | .endif |
| 22 | 26 | ||
| 23 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH | 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH |
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile index 3e525fd72d..7a3ddaa2c8 100644 --- a/src/lib/libssl/crypto/Makefile +++ b/src/lib/libssl/crypto/Makefile | |||
| @@ -12,12 +12,16 @@ CFLAGS+= -DL_ENDIAN -DBN_ASM | |||
| 12 | .if ${MACHINE_ARCH} == "mips" | 12 | .if ${MACHINE_ARCH} == "mips" |
| 13 | CFLAGS+= -DL_ENDIAN | 13 | CFLAGS+= -DL_ENDIAN |
| 14 | .else | 14 | .else |
| 15 | .if ${MACHINE_ARCH} == "vax" | ||
| 16 | CFLAGS+= -DL_ENDIAN | ||
| 17 | .else | ||
| 15 | .if ${MACHINE_ARCH} == "alpha" | 18 | .if ${MACHINE_ARCH} == "alpha" |
| 16 | # no ENDIAN stuff defined for alpha | 19 | # no ENDIAN stuff defined for alpha |
| 17 | .else | 20 | .else |
| 18 | CFLAGS+= -DB_ENDIAN | 21 | CFLAGS+= -DB_ENDIAN |
| 19 | .endif | 22 | .endif |
| 20 | .endif | 23 | .endif |
| 24 | .endif | ||
| 21 | .endif | 25 | .endif |
| 22 | 26 | ||
| 23 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH | 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH |
diff --git a/src/lib/libssl/src/Configure b/src/lib/libssl/src/Configure index 8c795f9799..2cd716b423 100644 --- a/src/lib/libssl/src/Configure +++ b/src/lib/libssl/src/Configure | |||
| @@ -363,6 +363,7 @@ my %table=( | |||
| 363 | 363 | ||
| 364 | # Some OpenBSD from Bob Beck <beck@obtuse.com> | 364 | # Some OpenBSD from Bob Beck <beck@obtuse.com> |
| 365 | "OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", | 365 | "OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", |
| 366 | "OpenBSD-vax", "gcc:-DL_ENDIAN -DTERMIOS -O2 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL:::", | ||
| 366 | "OpenBSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", | 367 | "OpenBSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", |
| 367 | "OpenBSD", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL:::", | 368 | "OpenBSD", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL:::", |
| 368 | "OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::", | 369 | "OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::", |
diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config index f57969bb44..53b219a1f9 100644 --- a/src/lib/libssl/src/config +++ b/src/lib/libssl/src/config | |||
| @@ -449,6 +449,7 @@ case "$GUESSOS" in | |||
| 449 | *86*-*-openbsd) OUT="OpenBSD-x86" ;; | 449 | *86*-*-openbsd) OUT="OpenBSD-x86" ;; |
| 450 | alpha*-*-openbsd) OUT="OpenBSD-alpha" ;; | 450 | alpha*-*-openbsd) OUT="OpenBSD-alpha" ;; |
| 451 | pmax*-*-openbsd) OUT="OpenBSD-mips" ;; | 451 | pmax*-*-openbsd) OUT="OpenBSD-mips" ;; |
| 452 | vax*-*-openbsd) OUT="OpenBSD-vax" ;; | ||
| 452 | *-*-openbsd) OUT="OpenBSD" ;; | 453 | *-*-openbsd) OUT="OpenBSD" ;; |
| 453 | *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;; | 454 | *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;; |
| 454 | *-*-osf) OUT="alpha-cc" ;; | 455 | *-*-osf) OUT="alpha-cc" ;; |
diff --git a/src/lib/libssl/ssl-patent/Makefile b/src/lib/libssl/ssl-patent/Makefile index 78acd2183b..70b3d31eac 100644 --- a/src/lib/libssl/ssl-patent/Makefile +++ b/src/lib/libssl/ssl-patent/Makefile | |||
| @@ -12,6 +12,9 @@ CFLAGS+= -DL_ENDIAN -DBN_ASM | |||
| 12 | .if ${MACHINE_ARCH} == "mips" | 12 | .if ${MACHINE_ARCH} == "mips" |
| 13 | CFLAGS+= -DL_ENDIAN | 13 | CFLAGS+= -DL_ENDIAN |
| 14 | .else | 14 | .else |
| 15 | .if ${MACHINE_ARCH} == "vax" | ||
| 16 | CFLAGS+= -DL_ENDIAN | ||
| 17 | .else | ||
| 15 | .if ${MACHINE_ARCH} == "alpha" | 18 | .if ${MACHINE_ARCH} == "alpha" |
| 16 | # no ENDIAN stuff defined for alpha | 19 | # no ENDIAN stuff defined for alpha |
| 17 | .else | 20 | .else |
| @@ -19,6 +22,7 @@ CFLAGS+= -DB_ENDIAN | |||
| 19 | .endif | 22 | .endif |
| 20 | .endif | 23 | .endif |
| 21 | .endif | 24 | .endif |
| 25 | .endif | ||
| 22 | 26 | ||
| 23 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE | 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE |
| 24 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}/include | 28 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}/include |
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile index 0f80ee5188..5e0f8ae8c1 100644 --- a/src/lib/libssl/ssl/Makefile +++ b/src/lib/libssl/ssl/Makefile | |||
| @@ -12,6 +12,9 @@ CFLAGS+= -DL_ENDIAN -DBN_ASM | |||
| 12 | .if ${MACHINE_ARCH} == "mips" | 12 | .if ${MACHINE_ARCH} == "mips" |
| 13 | CFLAGS+= -DL_ENDIAN | 13 | CFLAGS+= -DL_ENDIAN |
| 14 | .else | 14 | .else |
| 15 | .if ${MACHINE_ARCH} == "vax" | ||
| 16 | CFLAGS+= -DL_ENDIAN | ||
| 17 | .else | ||
| 15 | .if ${MACHINE_ARCH} == "alpha" | 18 | .if ${MACHINE_ARCH} == "alpha" |
| 16 | # no ENDIAN stuff defined for alpha | 19 | # no ENDIAN stuff defined for alpha |
| 17 | .else | 20 | .else |
| @@ -19,6 +22,7 @@ CFLAGS+= -DB_ENDIAN | |||
| 19 | .endif | 22 | .endif |
| 20 | .endif | 23 | .endif |
| 21 | .endif | 24 | .endif |
| 25 | .endif | ||
| 22 | 26 | ||
| 23 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE | 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE |
| 24 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}/include | 28 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}/include |
