From nobody Tue Jan 25 01:39:56 2022 X-Original-To: dev-commits-src-branches@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 D9FB11971FFB; Tue, 25 Jan 2022 01:39:56 +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 4JjV0D4K9fz4Zgt; Tue, 25 Jan 2022 01:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074796; 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=W+Yc6omWvga+7ibwhJnFVSYwYUNqZ7hff1BmFrGXoEo=; b=k2/BaCfbsHzK4wTpKvE5WCSiTetm1r1fKDkhVlD9YR0/r4rZleftBNycz79FNcwWYZYSdr hQEz0KpRyraU+MfSpXxGQCPS73OIBQXzUg1sTSAsGQRoShOQxW8Jh8W32Oki0Gw8oiIsWr rw0sM3N0Z/amSX7pD35jCcD/9kw7czHm0hLkhk8ikNEWgLxHl1fbb082sQzIH4qW3ATBXP jA95r+HbePlDAaRSxN82afBH+TxU8pkkD3o2Hm+U4qxxxzxJUp1aH59eBaLbETL6W7BxwH FF03zQ3anvcFFJ/NueJyooyTvnaigJZJ+VAR9YpzUQ1ubKJC0Y3TxyirQqaz3g== 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 5C799205D4; Tue, 25 Jan 2022 01:39:56 +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 20P1duGJ042858; Tue, 25 Jan 2022 01:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1duZ0042857; Tue, 25 Jan 2022 01:39:56 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:39:56 GMT Message-Id: <202201250139.20P1duZ0042857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 98ad84afd252 - stable/13 - src.libnames.mk: Add hack to workaround libarchive not being bootstrapped List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 98ad84afd2523a785cdd9b0ccb9a7125f4db2e34 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074796; 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=W+Yc6omWvga+7ibwhJnFVSYwYUNqZ7hff1BmFrGXoEo=; b=aJFuSLFdNM/Ey50AQ1gBiKGgxEVnyUffyfnGjA+/yfeIJE1On5qMtKlms7hunLDpeOH144 9jTYIzTNS9VSiRROSke2YrjmRsTGVZeFJeqktQzHIIMTdqOY29iqD0sOJRh8Mk8LuN3GxC zV8hlGdBpDzoXW79Ak9UuWQTe3h9P+j0VeAF8wxcvOAYfQfP8x7T4325eFOIYmiBC2YSO/ OqbhN8yAasa49u2YJRRabKxxhgVK4YN+I6qE8gMRKaDFloYMTUEEU2zyXn7IE5D36TSxRT QeW7JjIRBO72197JsnKzn0E/7mPuEGAOc9JjxJA5V9wNV0XbF2RawZHbFRiHGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074796; a=rsa-sha256; cv=none; b=RYp00Z9dFU1tnyud6WLduJSkS7vADyWY9/EEG07nu0Smz8ePXuBrpdmrTsZ2s1IMIlNRzQ ox6+UAmg+eOQmIEebb1Pybz/midHiA0POpUPhKnY68pp85nnTODGLk7PqgNSDHgXpNUte+ kI5yttuV28JYf6LbPJeRj2yQoyg5ama0v++ynWgITQbbLm7lu48VfyFwQDE1Elqfyq2PA0 VNMsxhaLnrSJVZjqKa5So5FyR/OpAQ/950m9Ih5Bl/cujEOe99eLyRocC16EKYk3jMcEDm Eymi/aVA6gveO7+et0lJQQLqUDF7RWxHtglvXoSTvGjXLUF9VT5Oc5qjriVVpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=98ad84afd2523a785cdd9b0ccb9a7125f4db2e34 commit 98ad84afd2523a785cdd9b0ccb9a7125f4db2e34 Author: Jessica Clarke AuthorDate: 2021-12-06 19:06:16 +0000 Commit: Jessica Clarke CommitDate: 2022-01-24 23:59:07 +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 (cherry picked from commit ed4050750c1ab35b1017afa7a998fbc8a62de454) --- 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 d1d8b60c51fe..8fd7547630a3 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -255,7 +255,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_zstd= pthread .if ${MK_BLACKLIST} != "no"