Module Name: src
Committed By: christos
Date: Mon May 8 14:30:34 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib: Makefile
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile
Log Message:
make legacy.so work
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/Makefile
diff -u src/crypto/external/bsd/openssl/lib/Makefile:1.6 src/crypto/external/bsd/openssl/lib/Makefile:1.7
--- src/crypto/external/bsd/openssl/lib/Makefile:1.6 Sun May 7 12:22:10 2023
+++ src/crypto/external/bsd/openssl/lib/Makefile Mon May 8 10:30:33 2023
@@ -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>
Index: src/crypto/external/bsd/openssl/lib/libdefault/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.1 src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.1 Sat May 6 13:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libdefault/Makefile Mon May 8 10:30:33 2023
@@ -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
Index: src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
diff -u src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.1 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.1 Sun May 7 12:22:10 2023
+++ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile Mon May 8 10:30:34 2023
@@ -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}
