git: 70f1e13491f9 - main - src.libnames.mk: Extend _DP_archive hack when bootstrapping on non-FreeBSD

The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=70f1e13491f958ca9f48ac41903dc851fed6c0c5

commit 70f1e13491f958ca9f48ac41903dc851fed6c0c5
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2021-12-06 23:06:34 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2021-12-07 00:24:20 +0000

    src.libnames.mk: Extend _DP_archive hack when bootstrapping on non-FreeBSD
    
    On Linux, libcrypto is available so a non-WITHOUT_OPENSSL build happens
    to work, but on macOS it isn't available to be linked against (though
    there is a versioned dylib for /usr/bin/openssl etc), and neither have
    libmd so would both be broken under WITHOUT_OPENSSL. Since we're using
    the system libarchive, further extend the hack to ensure _DP_archive is
    empty.
    
    Fixes:          ed4050750c1a ("src.libnames.mk: Add hack to workaround libarchive not being bootstrapped")
    MFC after:      1 week
---
 share/mk/src.libnames.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index bcaf07c88e9c..385e8616a82d 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -273,11 +273,14 @@ _DP_zstd=	pthread
 _DP_blacklist+=	pthread
 .endif
 _DP_crypto=	pthread
+# See comment by _DP_archive above
+.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
 .if ${MK_OPENSSL} != "no"
 _DP_archive+=	crypto
 .else
 _DP_archive+=	md
 .endif
+.endif
 _DP_sqlite3=	pthread
 _DP_ssl=	crypto
 _DP_ssh=	crypto crypt z