Mon May 15 16:12:39 2023 UTC ()
switch everyone to OpenSSL-3.x


(christos)
diff -r1.1323 -r1.1324 src/share/mk/bsd.own.mk
cvs diff -r1.1323 -r1.1324 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2023/05/14 22:44:53 1.1323
+++ src/share/mk/bsd.own.mk 2023/05/15 16:12:39 1.1324
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1323 2023/05/14 22:44:53 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.1324 2023/05/15 16:12:39 christos Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -121,40 +121,27 @@ EXTERNAL_BINUTILS_SUBDIR= /does/not/exis @@ -121,40 +121,27 @@ EXTERNAL_BINUTILS_SUBDIR= /does/not/exis
121HAVE_GDB?= 1100 121HAVE_GDB?= 1100
122 122
123.if ${HAVE_GDB} == 1310 123.if ${HAVE_GDB} == 1310
124EXTERNAL_GDB_SUBDIR= gdb 124EXTERNAL_GDB_SUBDIR= gdb
125.elif ${HAVE_GDB} == 1100 125.elif ${HAVE_GDB} == 1100
126EXTERNAL_GDB_SUBDIR= gdb.old 126EXTERNAL_GDB_SUBDIR= gdb.old
127.else 127.else
128EXTERNAL_GDB_SUBDIR= /does/not/exist 128EXTERNAL_GDB_SUBDIR= /does/not/exist
129.endif 129.endif
130 130
131# 131#
132# What OpenSSL is used? 132# What OpenSSL is used?
133# 133#
134.if ${MACHINE} == "amd64" || \ 
135 ${MACHINE} == "alpha" || \ 
136 ${MACHINE_ARCH:Maarch64*} || \ 
137 ${MACHINE_ARCH:M*arm*} || \ 
138 ${MACHINE_ARCH} == "powerpc" || \ 
139 ${MACHINE_ARCH} == "sparc64" || \ 
140 ${MACHINE} == "hppa" || \ 
141 ${MACHINE} == "i386" || \ 
142 ${MACHINE_ARCH} == "m68k" || \ 
143 ${MACHINE} == "vax" 
144HAVE_OPENSSL?= 30 134HAVE_OPENSSL?= 30
145.else 
146HAVE_OPENSSL?= 11 
147.endif 
148 135
149.if ${HAVE_OPENSSL} == 30 136.if ${HAVE_OPENSSL} == 30
150EXTERNAL_OPENSSL_SUBDIR=openssl 137EXTERNAL_OPENSSL_SUBDIR=openssl
151.elif ${HAVE_OPENSSL} == 11 138.elif ${HAVE_OPENSSL} == 11
152EXTERNAL_OPENSSL_SUBDIR=openssl.old 139EXTERNAL_OPENSSL_SUBDIR=openssl.old
153.else 140.else
154EXTERNAL_OPENSSL_SUBDIR=/does/not/exist 141EXTERNAL_OPENSSL_SUBDIR=/does/not/exist
155.endif 142.endif
156 143
157# 144#
158# Does the platform support ACPI? 145# Does the platform support ACPI?
159# 146#
160.if ${MACHINE} == "i386" || \ 147.if ${MACHINE} == "i386" || \