Sun Mar 4 00:17:05 2018 UTC ()
switch sh3 to openssl-1.1


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

--- src/share/mk/bsd.own.mk 2018/03/03 00:22:04 1.1039
+++ src/share/mk/bsd.own.mk 2018/03/04 00:17:05 1.1040
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1039 2018/03/03 00:22:04 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.1040 2018/03/04 00:17:05 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#
@@ -94,26 +94,27 @@ EXTERNAL_GCC_SUBDIR?= gcc.old @@ -94,26 +94,27 @@ EXTERNAL_GCC_SUBDIR?= gcc.old
94.else 94.else
95EXTERNAL_GCC_SUBDIR=? /does/not/exist 95EXTERNAL_GCC_SUBDIR=? /does/not/exist
96.endif 96.endif
97.else 97.else
98MKGCCCMDS?= no 98MKGCCCMDS?= no
99.endif 99.endif
100 100
101# 101#
102# What OpenSSL is used? 102# What OpenSSL is used?
103#  103#
104.if ${MACHINE} == "amd64" || \ 104.if ${MACHINE} == "amd64" || \
105 ${MACHINE} == "arm" || \ 105 ${MACHINE} == "arm" || \
106 ${MACHINE} == "i386" || \ 106 ${MACHINE} == "i386" || \
 107 ${MACHINE_ARCH} == "sh3" || \
107 ${MACHINE} == "sparc" || \ 108 ${MACHINE} == "sparc" || \
108 ${MACHINE} == "sparc64" 109 ${MACHINE} == "sparc64"
109HAVE_OPENSSL?= 11 110HAVE_OPENSSL?= 11
110.else 111.else
111HAVE_OPENSSL?= 10 112HAVE_OPENSSL?= 10
112.endif 113.endif
113 114
114.if ${HAVE_OPENSSL} == 11 115.if ${HAVE_OPENSSL} == 11
115EXTERNAL_OPENSSL_SUBDIR=openssl 116EXTERNAL_OPENSSL_SUBDIR=openssl
116.elif ${HAVE_OPENSSL} == 10 117.elif ${HAVE_OPENSSL} == 10
117EXTERNAL_OPENSSL_SUBDIR=openssl.old 118EXTERNAL_OPENSSL_SUBDIR=openssl.old
118.else 119.else
119EXTERNAL_OPENSSL_SUBDIR=/does/not/exist 120EXTERNAL_OPENSSL_SUBDIR=/does/not/exist