Date: Tue, 25 Jan 2022 01:40:06 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 9c210b36abe0 - stable/13 - src.libnames.mk: Extend _DP_archive hack when bootstrapping on non-FreeBSD Message-ID: <202201250140.20P1e6PR045559@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9c210b36abe0ecada8d32227a0bb40bba5185a68 commit 9c210b36abe0ecada8d32227a0bb40bba5185a68 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2021-12-06 23:06:34 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2022-01-24 23:59:28 +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 (cherry picked from commit 70f1e13491f958ca9f48ac41903dc851fed6c0c5) --- 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 98f50c22532b..ee3404b676c3 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -266,11 +266,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201250140.20P1e6PR045559>