From nobody Mon Dec 6 19:17:03 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7F04318C0DAC; Mon, 6 Dec 2021 19:17:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J7Cq34T7mz4fZq; Mon, 6 Dec 2021 19:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51C2F11B58; Mon, 6 Dec 2021 19:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B6JH3We007520; Mon, 6 Dec 2021 19:17:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6JH3WR007519; Mon, 6 Dec 2021 19:17:03 GMT (envelope-from git) Date: Mon, 6 Dec 2021 19:17:03 GMT Message-Id: <202112061917.1B6JH3WR007519@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ed4050750c1a - main - src.libnames.mk: Add hack to workaround libarchive not being bootstrapped List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed4050750c1ab35b1017afa7a998fbc8a62de454 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638818223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZVCdFR5JyxOis7m0vDI8Z1naaS2vuOXma2xiJfw5hQ=; b=P+kM8wRTDq2hOrhCZ5d3GQp0kLRNC2ebQ1MTGDJWN+gRKFgIYPKfKL/QDNpoi4frpjgDRL 8e2qTNfU6Ay/d5/J27phNX7FE5RFeMhIMcp0b/ek7G20IkO0tLzHrCkSCUURjvRVoyjVJV YjSow8W5DfUYBMLisoOZ+RkjlO/BxMuSFhAHwpaz/tm5HtPmsXX198zUV96vepebK1pbqq v3TcAgGurO3/ua3gg8XyPU0WYk9ZaWvVfCFEqSz9nPNCF2I/J6+NlgAih7rCMWGV8kiDpP n58O9pGTcqylX9j/VVL+N1ls/6oVhjUMavmVsUeFuuU9wbrSID0BeYeeeDArlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638818223; a=rsa-sha256; cv=none; b=bd/fEMrGrkhJ+0UjzWvGf9uSDnNRHdlLcJTUeemXUBL+xKYBM0N1GrKP9sISVIAQPCVskS 6b0wU45AhHqI3p/TWMJtonhOeuQMtwFm9dnq1RMPmwLwT4VyLbj2gH6V4vwZYg/kpkDzO+ UOCHNqt4IHlydVPQQje6CpVLZwnkVb8U2/tKWwyxhVXrf3X1geYxiyvrJldwh3/mDkvtwR +RUueo4mYDrcaFM8FR92adtiOcfVoZB//5Dbqy7szdTcen1ewTnvH5HQBREb48pxB10ewq vtiYseFs9mm4xpxKj9j4XFt8MBF8p6Uh9M4EfOuD3qq2Mz07D0wdKtBtNMog5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ed4050750c1ab35b1017afa7a998fbc8a62de454 commit ed4050750c1ab35b1017afa7a998fbc8a62de454 Author: Jessica Clarke AuthorDate: 2021-12-06 19:06:16 +0000 Commit: Jessica Clarke 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