Module Name: src
Committed By: christos
Date: Tue May 9 19:22:07 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Log Message:
make things build again.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/lib/libssl/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/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.26 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.27
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.26 Mon May 8 15:14:28 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Tue May 9 15:22:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/05/08 19:14:28 christos Exp $
+# $NetBSD: Makefile,v 1.27 2023/05/09 19:22:07 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -45,6 +45,7 @@ CPPFLAGS+= -I${OPENSSLSRC}/crypto/modes
CPPFLAGS+= -I${OPENSSLSRC}/../include
+
CRYPTODIST= ${NETBSDSRCDIR}/crypto
OPENSSLINC= ${OPENSSLSRC}/include/openssl
@@ -55,6 +56,8 @@ OPENSSLINC= ${OPENSSLSRC}/include/openss
.include "srcs.inc"
.include "${.CURDIR}/../libdefault/srcs.inc"
CPPFLAGS+= -I${.CURDIR}/../libdefault
+CPPFLAGS+= -I${OPENSSLSRC}/providers/common/include
+CPPFLAGS+= -I${OPENSSLSRC}/providers/implementations/include
.PATH: ${.CURDIR}/../libdefault
.include "${.CURDIR}/../libcommon/srcs.inc"
.PATH: ${.CURDIR}/../libcommon
Index: src/crypto/external/bsd/openssl/lib/libdefault/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.2 Mon May 8 10:30:33 2023
+++ src/crypto/external/bsd/openssl/lib/libdefault/Makefile Tue May 9 15:22:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/05/08 14:30:33 christos Exp $
+# $NetBSD: Makefile,v 1.3 2023/05/09 19:22:07 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -43,7 +43,8 @@ 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
OPENSSLINC= ${OPENSSLSRC}/include/openssl
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.12 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.13
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.12 Sun May 7 15:13:15 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Tue May 9 15:22:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/05/07 19:13:15 christos Exp $
+# $NetBSD: Makefile,v 1.13 2023/05/09 19:22:07 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -36,6 +36,8 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto
.PATH: ${OPENSSLSRC} ${OPENSSLSRC}/crypto/pqueue ${OPENSSLSRC}/include/openssl
.include "srcs.inc"
+.PATH: ${OPENSSLSRC}/crypto
+SRCS+= packet.c
LIBDPLIBS+=crypto ${.CURDIR}/../libcrypto
@@ -51,6 +53,7 @@ PKGCONFIG=libssl openssl
.include "${.CURDIR}/../../pkgconfig.mk"
+
GENH = \
ssl.h
