Tue Apr 18 20:11:34 2023 UTC ()
switch everyone to openssl.old


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

--- src/share/mk/bsd.own.mk 2023/04/02 15:06:06 1.1309
+++ src/share/mk/bsd.own.mk 2023/04/18 20:11:34 1.1310
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1309 2023/04/02 15:06:06 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.1310 2023/04/18 20:11:34 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#
@@ -120,29 +120,29 @@ HAVE_GDB?= 1100 @@ -120,29 +120,29 @@ HAVE_GDB?= 1100
120.if ${HAVE_GDB} == 1310 120.if ${HAVE_GDB} == 1310
121EXTERNAL_GDB_SUBDIR= gdb 121EXTERNAL_GDB_SUBDIR= gdb
122.elif ${HAVE_GDB} == 1100 122.elif ${HAVE_GDB} == 1100
123EXTERNAL_GDB_SUBDIR= gdb.old 123EXTERNAL_GDB_SUBDIR= gdb.old
124.else 124.else
125EXTERNAL_GDB_SUBDIR= /does/not/exist 125EXTERNAL_GDB_SUBDIR= /does/not/exist
126.endif 126.endif
127 127
128# 128#
129# What OpenSSL is used? 129# What OpenSSL is used?
130# 130#
131HAVE_OPENSSL?= 11 131HAVE_OPENSSL?= 11
132 132
133.if ${HAVE_OPENSSL} == 11 133.if ${HAVE_OPENSSL} == 30
134EXTERNAL_OPENSSL_SUBDIR=openssl 134EXTERNAL_OPENSSL_SUBDIR=openssl
135.elif ${HAVE_OPENSSL} == 10 135.elif ${HAVE_OPENSSL} == 11
136EXTERNAL_OPENSSL_SUBDIR=openssl.old 136EXTERNAL_OPENSSL_SUBDIR=openssl.old
137.else 137.else
138EXTERNAL_OPENSSL_SUBDIR=/does/not/exist 138EXTERNAL_OPENSSL_SUBDIR=/does/not/exist
139.endif 139.endif
140 140
141# 141#
142# Does the platform support ACPI? 142# Does the platform support ACPI?
143# 143#
144.if ${MACHINE} == "i386" || \ 144.if ${MACHINE} == "i386" || \
145 ${MACHINE} == "amd64" || \ 145 ${MACHINE} == "amd64" || \
146 ${MACHINE} == "ia64" || \ 146 ${MACHINE} == "ia64" || \
147 ${MACHINE_ARCH:Maarch64*} 147 ${MACHINE_ARCH:Maarch64*}
148HAVE_ACPI= yes 148HAVE_ACPI= yes