From nobody Tue Jan 25 01:40:06 2022 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 DA50419729BB; Tue, 25 Jan 2022 01:40:07 +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 4JjV0Q5ym1z4Zml; Tue, 25 Jan 2022 01:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074807; 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=TAjnyiw4NEzMSF6AYl+Prk03jQFpmnLMYKZtFRAY72Y=; b=WqaHgfzuZ8Sz8h4Ffp9RdPwLgEETwoV8wDrwcvV+1sbI6J8c+42h2xOTsgS8Hf/6zXG4yA c/jZY88xJvKvI+HbvGnILeHrflbvXaBB5GhxUDIbYCfq/MxJRzxcBdC3ptdZEHKPg7SnKS 6CFEahGX80NNAeexLj7nuHuLgF9bMRVV+8kHC0PwNPJbnBjB6npULGnMe0Ai/Y7wgscTE7 ZSYwC437iSRkbe6dYRAP7V0BG/Aan+AB4gmsxxEfg+AO7kqKdjA/ihK0n6Rg8D8sEUOK1p HAqImhABD70krrr7iTSRqMBcxMI7fz8YTmG3DMQPAGIsMDl60ZXzbBjLMzDT7g== 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 499BE20C76; Tue, 25 Jan 2022 01:40:06 +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 20P1e6N4045561; Tue, 25 Jan 2022 01:40:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1e6PR045559; Tue, 25 Jan 2022 01:40:06 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:06 GMT Message-Id: <202201250140.20P1e6PR045559@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: 9c210b36abe0 - stable/13 - src.libnames.mk: Extend _DP_archive hack when bootstrapping on non-FreeBSD 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c210b36abe0ecada8d32227a0bb40bba5185a68 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074807; 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=TAjnyiw4NEzMSF6AYl+Prk03jQFpmnLMYKZtFRAY72Y=; b=kSkGJtoFRQBTrwimOtb+yqVeDGN1sKgkFra2ORu3JSMyBv5e4DSYnHkPwlqx78dYxA3SRD 21D40zbs4arGN7odXuR1hVifrZhyaOJzVx+hdyssk3HCpHLQ4eMl0Wi2NyziCG78CCxa8V 04o0LPpud9SSVbsMuCOL+uKS+NW1ssRFKkwgks/DISWJSbhpJvNyXk76168SpKJEr0il2J BeMvI/otZkwKv4gUq/jIvpqVOUkRgDuD4F/B2nm9a4NZ1ebGkMJWDvyVsu3pW0FjXgPNEL 1eV3qOSEzHdpjCf3z7FwnzKi1xUKJioT86ICMaBHFW36AjsFnGk+DoHhBabWFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074807; a=rsa-sha256; cv=none; b=A3lms5SPGnFq0M2ClJx+AxfRkrx9zWz4WrRyEGp8AdKMxWmxwvG+6VvFmzQvXeDWy5B5r4 vDFSF8895ZRiAjnIJEq/RWubdW1IYAdb8aFlRwIKmQ4MEO0DI+Y1ahNjaY8qD7SfaD2a0r WChwk/YfDus6zusJb71dvlDPUirOnMCcO5cFDop23zffKXU6q5EsmRAG6LJ2GZSLJsMEeh PlQCb67eg0BBiRtOYMue9XMHgN7M+e365fTNiAmQxlpFifP+Bgn7yFsuO/CwFbONHvXtPM IJhc3DDzTF6UtI1tIsjtFbrAeyQ4SvUVCdMukeTILJFss+6zkigzsZ02ZekTXA== 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=9c210b36abe0ecada8d32227a0bb40bba5185a68 commit 9c210b36abe0ecada8d32227a0bb40bba5185a68 Author: Jessica Clarke AuthorDate: 2021-12-06 23:06:34 +0000 Commit: Jessica Clarke 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