Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk switch sparc64/aarch64 to OpenSSL-3.x



details:   https://anonhg.NetBSD.org/src/rev/71e639221acb
branches:  trunk
changeset: 374764:71e639221acb
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 11 17:57:14 2023 +0000

description:
switch sparc64/aarch64 to OpenSSL-3.x

diffstat:

 distrib/sets/lists/base/md.sparc64 |  6 +++++-
 etc/mtree/NetBSD.dist.sparc64      |  6 +++++-
 share/mk/bsd.own.mk                |  6 ++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 6a1e38b6c85d -r 71e639221acb distrib/sets/lists/base/md.sparc64
--- a/distrib/sets/lists/base/md.sparc64        Thu May 11 17:22:56 2023 +0000
+++ b/distrib/sets/lists/base/md.sparc64        Thu May 11 17:57:14 2023 +0000
@@ -1,8 +1,12 @@
-# $NetBSD: md.sparc64,v 1.257 2022/09/08 05:16:45 rillig Exp $
+# $NetBSD: md.sparc64,v 1.258 2023/05/11 17:57:14 christos Exp $
 ./libexec/ld.elf_so-sparc                      base-sysutil-bin        compat,pic
 ./sbin/edlabel                                 base-obsolete   obsolete
 ./usr/bin/fdformat                             base-util-bin
 ./usr/libexec/ld.elf_so-sparc                  base-sysutil-bin        compat,pic
+./usr/lib/sparc/openssl                                base-crypto-usr
+./usr/lib/sparc/openssl/engines                        base-crypto-usr
+./usr/lib/sparc/openssl/modules                        base-crypto-usr
+./usr/lib/sparc/openssl/modules/legacy.so      base-crypto-usr         compat,pic,openssl=30
 ./usr/lkm/compat_netbsd32.o                    base-obsolete           obsolete
 ./usr/lkm/compat_sunos32.o                     base-obsolete           obsolete
 ./usr/lkm/compat_svr4.o                                base-obsolete           obsolete
diff -r 6a1e38b6c85d -r 71e639221acb etc/mtree/NetBSD.dist.sparc64
--- a/etc/mtree/NetBSD.dist.sparc64     Thu May 11 17:22:56 2023 +0000
+++ b/etc/mtree/NetBSD.dist.sparc64     Thu May 11 17:57:14 2023 +0000
@@ -1,3 +1,7 @@
-#      $NetBSD: NetBSD.dist.sparc64,v 1.14 2019/04/03 19:52:38 nakayama Exp $
+#      $NetBSD: NetBSD.dist.sparc64,v 1.15 2023/05/11 17:57:14 christos Exp $
 
 ./usr/include/sparc
+./usr/lib/sparc
+./usr/lib/sparc/openssl
+./usr/lib/sparc/openssl/modules
+./usr/lib/sparc/openssl/engines
diff -r 6a1e38b6c85d -r 71e639221acb share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu May 11 17:22:56 2023 +0000
+++ b/share/mk/bsd.own.mk       Thu May 11 17:57:14 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1315 2023/05/11 08:49:41 skrll Exp $
+#      $NetBSD: bsd.own.mk,v 1.1316 2023/05/11 17:57:14 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -131,7 +131,9 @@ EXTERNAL_GDB_SUBDIR=                /does/not/exist
 #
 # What OpenSSL is used?
 #
-.if ${MACHINE} == "amd64"
+.if ${MACHINE} == "amd64" || \
+    ${MACHINE_ARCH:Maarch64*} || \
+    ${MACHINE_ARCH} == "sparc64"
 HAVE_OPENSSL?= 30
 .else
 HAVE_OPENSSL?=  11



Home | Main Index | Thread Index | Old Index