Date: Mon, 6 Dec 2021 19:17:03 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ed4050750c1a - main - src.libnames.mk: Add hack to workaround libarchive not being bootstrapped Message-ID: <202112061917.1B6JH3WR007519@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ed4050750c1ab35b1017afa7a998fbc8a62de454 commit ed4050750c1ab35b1017afa7a998fbc8a62de454 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2021-12-06 19:06:16 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2021-12-06 19:16:27 +0000 src.libnames.mk: Add hack to workaround libarchive not being bootstrapped We don't currently honour _DP_foo when bootstrapping on non-FreeBSD, and so none of these values matter, but the next commit will change that as we do need to pull in dependencies for libdwarf. We should really be bootstrapping our libarchive for ar anyway rather than using the host's, as well as have a better way to communicate to src.libnames.mk whether or not a library is being bootstrapped. MFC after: 1 week --- share/mk/src.libnames.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 23d09a434466..4339b4f5bb50 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -261,7 +261,11 @@ LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a # 2nd+ order consumers. Auto-generating this would be better. _DP_80211= sbuf bsdxml _DP_9p= sbuf +# XXX: Not bootstrapped so uses host version on non-FreeBSD, so don't use a +# FreeBSD-specific dependency list +.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) _DP_archive= z bz2 lzma bsdxml zstd +.endif _DP_avl= spl _DP_bsddialog= formw ncursesw tinfow _DP_zstd= pthread
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112061917.1B6JH3WR007519>