[src/trunk]: src/crypto/external/bsd/openssl/lib make legacy.so work

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f68d714cee5b
branches:  trunk
changeset: 374624:f68d714cee5b
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 08 14:30:33 2023 +0000

description:
make legacy.so work

diffstat:

 crypto/external/bsd/openssl/lib/Makefile            |  6 +++---
 crypto/external/bsd/openssl/lib/libdefault/Makefile |  4 +---
 crypto/external/bsd/openssl/lib/liblegacy/Makefile  |  9 ++++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r 32bfb24b9ba9 -r f68d714cee5b crypto/external/bsd/openssl/lib/Makefile
--- a/crypto/external/bsd/openssl/lib/Makefile  Mon May 08 10:24:07 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/Makefile  Mon May 08 14:30:33 2023 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.6 2023/05/07 16:22:10 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2023/05/08 14:30:33 christos Exp $
 
 .include "bsd.own.mk"
 
 # OpenSSL libraries.
-SUBDIR= libapps liblegacy libcrypto libcryptotest libdes
+SUBDIR= libapps libcommon libcrypto libcryptotest libdes
 
-SUBDIR+= .WAIT libssl          # depends on libcrypto
+SUBDIR+= .WAIT libssl liblegacy        # depends on libcrypto, libcommon
 
 .include <bsd.subdir.mk>
diff -r 32bfb24b9ba9 -r f68d714cee5b crypto/external/bsd/openssl/lib/libdefault/Makefile
--- a/crypto/external/bsd/openssl/lib/libdefault/Makefile       Mon May 08 10:24:07 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libdefault/Makefile       Mon May 08 14:30:33 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2023/05/06 17:07:23 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2023/05/08 14:30:33 christos Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -43,8 +43,6 @@ CPPFLAGS+= -I${OPENSSLSRC}/include -I${O
 CPPFLAGS+= -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp
 CPPFLAGS+= -I${OPENSSLSRC}/crypto/modes
 CPPFLAGS+= -I${OPENSSLSRC}/../include
-CPPFLAGS+= -I${OPENSSLSRC}/providers/common/include
-CPPFLAGS+= -I${OPENSSLSRC}/providers/implementations/include
 
 
 CRYPTODIST=    ${NETBSDSRCDIR}/crypto
diff -r 32bfb24b9ba9 -r f68d714cee5b crypto/external/bsd/openssl/lib/liblegacy/Makefile
--- a/crypto/external/bsd/openssl/lib/liblegacy/Makefile        Mon May 08 10:24:07 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/liblegacy/Makefile        Mon May 08 14:30:33 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2023/05/07 16:22:10 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2023/05/08 14:30:34 christos Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -54,11 +54,11 @@ OPENSSLINC= ${OPENSSLSRC}/include/openss
 .include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
 .PATH: ${OPENSSLSRC} ${OPENSSLINC}
 .PATH: ${OPENSSLSRC}/../include/openssl
-.PATH: ${OPENSSLSRC}/providers/implementations/digests
-.PATH: ${OPENSSLSRC}/providers/implementations/macs
 
 .include "srcs.inc"
 
+SRCS+=legacyprov.c
+
 AFLAGS+=-DELF
 
 OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
@@ -78,6 +78,9 @@ libinstall::
 
 LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
 
+LIBDPLIBS+= common ${.CURDIR}/../libcommon
+LIBDPLIBS+= crypto ${.CURDIR}/../libcrypto
+
 .include <bsd.lib.mk>
 
 ${DESTDIR}${LIBDIR}/${LIB}.so: lib${LIB}.so.${SHLIB_FULLVERSION}