Source-Changes-HG archive

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

[src/trunk]: src/crypto Adjust for 3.x



details:   https://anonhg.NetBSD.org/src/rev/911bddf57734
branches:  trunk
changeset: 374600:911bddf57734
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 07 16:24:28 2023 +0000

description:
Adjust for 3.x

diffstat:

 crypto/Makefile.openssl |  17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 902beadc309b -r 911bddf57734 crypto/Makefile.openssl
--- a/crypto/Makefile.openssl   Sun May 07 16:22:10 2023 +0000
+++ b/crypto/Makefile.openssl   Sun May 07 16:24:28 2023 +0000
@@ -1,12 +1,25 @@
-#      $NetBSD: Makefile.openssl,v 1.12 2020/03/22 00:54:03 christos Exp $
+#      $NetBSD: Makefile.openssl,v 1.13 2023/05/07 16:24:28 christos Exp $
 
 .ifndef _MAKEFILE_OPENSSL_INCLUDED
 _MAKEFILE_OPENSSL_INCLUDED=1
 
 .include <bsd.own.mk>
 
+.if ${HAVE_OPENSSL} <= 11
+OSSL_ENGINESDIR=/usr/lib/openssl
+.else
+.      if defined(MLIBDIR)
+OSSL_LIBDIR=/usr/lib/${MLIBDIR}/openssl
+.      else
+OSSL_LIBDIR=/usr/lib/openssl
+.      endif
+OSSL_ENGINESDIR=${OSSL_LIBDIR}/engines
+OSSL_MODULESDIR=${OSSL_LIBDIR}/modules
+.endif
+
 OPENSSLSRC=    ${CRYPTODIST}/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/dist
 CPPFLAGS+=     -DOPENSSLDIR=\"/etc/openssl\"
-CPPFLAGS+=     -DENGINESDIR=\"/usr/lib/openssl\"
+CPPFLAGS+=     -DENGINESDIR=\"${OSSL_ENGINESDIR}\"
+CPPFLAGS+=     -DMODULESDIR=\"${OSSL_MODULESDIR}\"
 
 .endif



Home | Main Index | Thread Index | Old Index