From nobody Tue Dec 7 00:24:50 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 3E77618D1D6C; Tue, 7 Dec 2021 00:24:53 +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 4J7LfC45PKz3w6Z; Tue, 7 Dec 2021 00:24:51 +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 EAB0415D6B; Tue, 7 Dec 2021 00:24:50 +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 1B70Ootg020898; Tue, 7 Dec 2021 00:24:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B70Oov8020897; Tue, 7 Dec 2021 00:24:50 GMT (envelope-from git) Date: Tue, 7 Dec 2021 00:24:50 GMT Message-Id: <202112070024.1B70Oov8020897@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: 8f7eb330f7a4 - main - Makefile.inc1: Bootstrap libcrypt on non-FreeBSD for libroken 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: 8f7eb330f7a4c7454d7eb6586a5f86091321382b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638836692; 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=P+0H53gxD2yJDvUMdsEQBjCJohydq+YIUYHiv8rmqlc=; b=pQcLv70HbzqIHUsx74NwQoBfYCOjkRJ3dm9naaburzx4o7muHNN76NTF24hQC2Igrg85cF u1b39uy0TO4Mn4JdAyRFBRqTJe9gDBijc/TV46KUuvdAFI31q9XJyg5QTGKfRGRq7LftBe EEwZfvJnsRsdp5o4cV+7mNevrbDEqnBBNfxvBtYvoe0rfxugSyDo/3lAUHofFXxSgJt44m 5Zp1vD/HcgojUTber+OCW7K5g6BDm/Gi0V1fcpgRssIj/xoqodu+9qbbrsWe8L6UYArdZW jyYp+jre6uA+r/gqI9req6s8vIr07pXCrHZtsvzQoZyDiQ5BTUj1pRKr3ZQ4sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638836692; a=rsa-sha256; cv=none; b=uSXiTloBg0FzDosVJLHB1mB3McdNuVVJkYFvD7tdrwtjYfthm7yCD/E8Dg389bzVMDpQml ye616E0FE6jUOm80XmJxXjtt/i7EV68OxwAEq9dXadSjsMhhoqXk0wB2CWtzEtqTBSlPfX EMCrlis34OV5Q9IH5lWyTqsIlBNLAS7Wczvs0MtFf1YGb7O9zvv7/5JFixqBbBPkOiDz4B Nve5Rc8cNB3xxiDEllDxvvVVa94ecnJwpgIGi7d0o0VziVmFYSe4TY3ARKXgLUvQbswUfj p17EATRJViYS5hvLOINQ9Y8w7WRaCfrJhplAOFgiQwBT3ursHLmnqpFr8G2XiA== 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=8f7eb330f7a4c7454d7eb6586a5f86091321382b commit 8f7eb330f7a4c7454d7eb6586a5f86091321382b Author: Jessica Clarke AuthorDate: 2021-12-06 23:00:31 +0000 Commit: Jessica Clarke CommitDate: 2021-12-07 00:24:20 +0000 Makefile.inc1: Bootstrap libcrypt on non-FreeBSD for libroken After f0a6ab51e6da, we need libroken's dependencies to be present; in particular, libcrypt is not present on macOS, and so needs to be bootstrapped. We include this on Linux too for consistency and to avoid future compatibility issues, even if strictly unnecessary currently. Fixes: f0a6ab51e6da ("src.libnames.mk: Include dependencies when bootstrapping from non-FreeBSD" MFC after: 1 week --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2f425a6552e9..2f7d98341793 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2473,6 +2473,10 @@ ${_bt}-usr.bin/grep: ${_bt}-lib/libbz2 # libdwarf depends on libz _other_bootstrap_tools+=lib/libz ${_bt}-lib/libdwarf: ${_bt}-lib/libz + +# libroken depends on libcrypt +_other_bootstrap_tools+=lib/libcrypt +${_bt}-lib/libroken: ${_bt}-lib/libcrypt .else # All tools in _basic_bootstrap_tools have the same name as the subdirectory # so we can use :T to get the name of the symlinks that we need to create.