From nobody Tue Dec 07 00:24:48 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 B74CB18D2017; Tue, 7 Dec 2021 00:24:49 +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 4J7Lf85rZ1z3vfk; Tue, 7 Dec 2021 00:24:48 +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 A50D815EC4; Tue, 7 Dec 2021 00:24:48 +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 1B70Om0K020844; Tue, 7 Dec 2021 00:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B70OmVP020843; Tue, 7 Dec 2021 00:24:48 GMT (envelope-from git) Date: Tue, 7 Dec 2021 00:24:48 GMT Message-Id: <202112070024.1B70OmVP020843@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: 8ceba27a5d51 - main - cross-build: Define crypt_data in unistd.h for libcrypt 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: 8ceba27a5d51e2fcc0ea547d5051bd859d15233c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638836688; 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=JihWFkbWFszjoT0hgohh8FMzMf0uh20sp5V6lDWjl94=; b=sRGAYvumMgrJkxKty4RIBb8kJknyEitvH2bgBuK/kf84rK6uJiCw5m4clBGseI5ctazWKA kG9HryF890UI2J2WYPCounSuyi+oQ+WFmjRxVlUST1BZyEsCdP1Qzdq8aiG+DBSSRX/vId MMv19CAXqPudSN2ZEtircwRcJS9xACoG/a3XkkEz3ME8V2nOW7hftLkIg7TfKLGLz/p8bb C5cU8gzp+j40TQ1M/gCCv+pj0UJRU8L/WvKOzXaSS0HCaW4/QTXkGUw31srsigqPzeO9L7 fQKesCP4rxRs7mSplbZ4GO1SUAOUhgzzJVRYRuj9skqatEM6kNJggclOvZ/zgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638836688; a=rsa-sha256; cv=none; b=xVbICcqB4BpathK12f+tgScV/b5UbYTN/uVabyZn0w6uC3rsRPu5ELbHsdDCZJfnSjcccs 6AR08Bd5K9PLFWG6Y979yz6SI+u/9ZF37u5OpJ59VZh0qn6X/WCeUndjGzKTL34WYeqkWj dp+rZU4zoxsQCkxBq6R0V9TZzSc7CLv2Bgg5j5SMlbyMO3Gf2O+Sy3/XUOAvFJBO1YhRFv AkgfcLQ1RNLq9+0E1XG7d0iT3lJ16G4pE06JYkjxTtxVgdpEeaGnGbTKvrR7g/pAEb8PjC mh8nWM81nuvAPG2ilHpIy9xrHcWvxOrIbtTXkehmP5LCE48MpdpW1PXnRoPwMg== 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=8ceba27a5d51e2fcc0ea547d5051bd859d15233c commit 8ceba27a5d51e2fcc0ea547d5051bd859d15233c Author: Jessica Clarke AuthorDate: 2021-12-06 22:29:51 +0000 Commit: Jessica Clarke CommitDate: 2021-12-07 00:24:19 +0000 cross-build: Define crypt_data in unistd.h for libcrypt This is where it's defined in the base system, so is where libcrypt expects it to exist when being built, and will be needed when being bootstrapped in a subsequent commit. MFC after: 1 week --- tools/build/cross-build/include/common/unistd.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/build/cross-build/include/common/unistd.h b/tools/build/cross-build/include/common/unistd.h index 593dd700f140..fbcc0cc31795 100644 --- a/tools/build/cross-build/include/common/unistd.h +++ b/tools/build/cross-build/include/common/unistd.h @@ -39,6 +39,11 @@ #include_next #include +struct crypt_data { + int initialized; /* For compatibility with glibc. */ + char __buf[256]; /* Buffer returned by crypt_r(). */ +}; + static inline int check_utility_compat(const char *utility __unused) {