From nobody Tue Dec 07 00:24:51 2021 X-Original-To: dev-commits-src-main@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 381D518D1D6B; 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 4J7LfD3yy0z3vwJ; Tue, 7 Dec 2021 00:24:52 +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 1656015DB3; Tue, 7 Dec 2021 00:24:52 +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 1B70OpT8020923; Tue, 7 Dec 2021 00:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B70Ophm020922; Tue, 7 Dec 2021 00:24:51 GMT (envelope-from git) Date: Tue, 7 Dec 2021 00:24:51 GMT Message-Id: <202112070024.1B70Ophm020922@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: 70f1e13491f9 - main - src.libnames.mk: Extend _DP_archive hack when bootstrapping on non-FreeBSD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 70f1e13491f958ca9f48ac41903dc851fed6c0c5 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=qqVhNPgvAB5pEjh7m5KAZaIetI1uRnM1H8tR8FxSLOk=; b=SRLQMPUr5hjHpWHJaCKWF+jhITkAdjMCD1S8uRw3MYBf5mdeiqjJ/193dkmzzerSe29Yp0 SgmmzxPdoQyn3K+alihzUovXB3IWR1O5pMlNTesG1NA/Y+jIwyYrZvcv2tqyryf7ptGlUF gef/6up4nTTDYEjbbNGvXjUSn7zkD7rlS3KF9nq0M+AmZVownaiFHCZlh81YhWylgKR8uS WWTHLF7XXcWwSDW7HE0EzP/ujDKi/udWB6wSghhON8BpIbzjv9DOoX2Fag4P6TJfDY9xD8 JXLtgfBknILbzSI+fU2Q9ARj/cTGcjGPNVmKq09py8Wo1BBFRRCK2CvltN2leQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638836692; a=rsa-sha256; cv=none; b=USCRzr1WDxp8qAk6PX4N1IcYYLNVuPiMwsCo6q4QFAO3NiGfNiFjtUUVBku42W0J6XyUdU lP5RDUbgJZrSQMs7n4beG7I6FmN/oh1+huFavwhcQh86keELJ+vCc1AAGJb5Lqzk6xfyks 21uM3lLnVI6P01OYyjf80J65c22yswpOndx3yW5m9XTmDF0DKfQ+FU/TgzvKBD8PdAJxnj ImPE7VusdEIImBzA3Bo+SumueuNlHxdSc0S06SGw257YabqNeHj+nSeL5fo+Ad9UgGMPsd RGOAVkCsEwq3fwWGyu1Hv1xlRiGRmlP28gtjsormfBAYK3Ri3lS8DcxTTl6Bkw== 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=70f1e13491f958ca9f48ac41903dc851fed6c0c5 commit 70f1e13491f958ca9f48ac41903dc851fed6c0c5 Author: Jessica Clarke AuthorDate: 2021-12-06 23:06:34 +0000 Commit: Jessica Clarke CommitDate: 2021-12-07 00:24:20 +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 --- 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 bcaf07c88e9c..385e8616a82d 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -273,11 +273,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