From nobody Fri Oct 18 20:53:39 2024 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 4XVcPH1p7gz5Yx27; Fri, 18 Oct 2024 20:53:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XVcPH1JFWz4Kyr; Fri, 18 Oct 2024 20:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729284819; 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=xYSXn9MFmytPAximTuXLnYxBMC9GgZZs95aSKXpMSIQ=; b=s3lpITpvRn0lZaq6MKC+CAh1UOdoSOVYdICttv/9JUElr4nL70JQyAjj6lS459wkenWGID IYMYGnHMfQ9ghxVOsT5dkbwdS/Z+8t9VxOcGpufm1Ef170POM/+y7i1Rez2qg3nMqtIawf ojf6ThIKZ/r7kHujNt/XMlCQhBXUCDT8kVhQqbENXyv/zV8NGCCIBhbw1m7Ud14WRK3RZu XNUWME1BZ16nzTjd3MCxWG3BatZLZXb9zGor07PySMUiZKKDgYo6k1EMw3UJ+ygJK/KBdb MtcZ2zgjgIBlYSO/6WqkSZT9F6VSrNj8kFMVm5rWjiPHZpbWpjdPtYpBh0puCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729284819; 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=xYSXn9MFmytPAximTuXLnYxBMC9GgZZs95aSKXpMSIQ=; b=c5AP26uJt1+is3q6jicHEd3QE/eR6bp+V0JiELByyDkDV3Caxis6My8broQ2nt7Fl3ou8R DiE5B6Or9LSL/+0aEjryVfXT8PVOHGRJ0JnCtiSOMNYnQsh6iEqZATkOuBo6sZltg/u04b aZPcsgVQD7pexLwj63hUomgXsiIiDVCEXFkLlPAS3IyaV1LHDapLPiYWLYf1jxSMHlU+PO wY/ZJd+NPepSOSbJ5XPxLqyza7gvdr6J2UUMRGCnA3ejPBqdkqgWCMau0bYIKkxHrFBETu awG7hlCOtLeTc1eqMzPYUBfxJSFV7BDLtxvSoIxUBu6rn8HSWKVTjspFRKcW5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729284819; a=rsa-sha256; cv=none; b=nTSf/9R619UbnDFWynX+NK1hiV20e67QbqweUNKdWI2KLsjKOUAkDcNe6lhQghiDYicdfa wgjJsz8sPiaH/GR5EYZhW8TE3SJ4grvuH7BxhCuSCvDSZ6gXKLwZA8kjsY+p42YmFw2QIR ibtCJYw3L1jpMRNWvYLxzd6qhor9vjhbTWRs0TgPm/Tpm1vdhiRkTISFyXdJDdcn4H3G/2 H4/dL+N/4RTTGjQxEEr8JYBEdod1ZioQJZOCqTB6XF9xda5te3rZ2564sVC0+QMri0oIet lykZ0ghekKhC2TaJHzIBE/TPR5OsLONfb8BCipe3mqk30Q9m0qjyvi3x06mDMQ== 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 4XVcPH0tjhzpcx; Fri, 18 Oct 2024 20:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49IKrdGS026590; Fri, 18 Oct 2024 20:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49IKrdm4026587; Fri, 18 Oct 2024 20:53:39 GMT (envelope-from git) Date: Fri, 18 Oct 2024 20:53:39 GMT Message-Id: <202410182053.49IKrdm4026587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 83069000750d - main - cross-build: fix missing the proper way 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83069000750d0517a329caf7d519cadf270ba5f7 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=83069000750d0517a329caf7d519cadf270ba5f7 commit 83069000750d0517a329caf7d519cadf270ba5f7 Author: Kyle Evans AuthorDate: 2024-10-18 20:44:15 +0000 Commit: Kyle Evans CommitDate: 2024-10-18 20:53:15 +0000 cross-build: fix missing the proper way Add it to tools/build/Makefile with a short note of where it's needed, rather than hamfistedly copying it into the tools/build hierarchy. Reported by: jrtc27 Reviewed by: jrtc27 Fixes: aad507854efd13c43 ("Fix the cross-build after recent commits") Differential Revision: https://reviews.freebsd.org/D46854 --- tools/build/Makefile | 4 ++ tools/build/cross-build/include/common/sys/md4.h | 91 ------------------------ 2 files changed, 4 insertions(+), 91 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index 9e9d203f108b..faf130f3d99c 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -304,6 +304,10 @@ SYSINCS+= ${SRCTOP}/sys/sys/ctf.h SYSINCS+= ${SRCTOP}/sys/sys/kbio.h # for kldxref: SYSINCS+= ${SRCTOP}/sys/sys/module.h +.if ${.MAKE.OS} != "FreeBSD" +# for libmd: +SYSINCS+= ${SRCTOP}/sys/sys/md4.h +.endif # We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't # accidentally run tools that are incompatible but happen to be in $PATH. diff --git a/tools/build/cross-build/include/common/sys/md4.h b/tools/build/cross-build/include/common/sys/md4.h deleted file mode 100644 index e00675e9f462..000000000000 --- a/tools/build/cross-build/include/common/sys/md4.h +++ /dev/null @@ -1,91 +0,0 @@ -/* MD4.H - header file for MD4C.C - */ - -/*- - SPDX-License-Identifier: RSA-MD - - Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - rights reserved. - - License to copy and use this software is granted provided that it - is identified as the "RSA Data Security, Inc. MD4 Message-Digest - Algorithm" in all material mentioning or referencing this software - or this function. - License is also granted to make and use derivative works provided - that such works are identified as "derived from the RSA Data - Security, Inc. MD4 Message-Digest Algorithm" in all material - mentioning or referencing the derived work. - - RSA Data Security, Inc. makes no representations concerning either - the merchantability of this software or the suitability of this - software for any particular purpose. It is provided "as is" - without express or implied warranty of any kind. - - These notices must be retained in any copies of any part of this - documentation and/or software. - */ - -#ifndef _SYS_MD4_H_ -#define _SYS_MD4_H_ -/* MD4 context. */ -typedef struct MD4Context { - u_int32_t state[4]; /* state (ABCD) */ - u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ - unsigned char buffer[64]; /* input buffer */ -} MD4_CTX; - -#include - -#ifndef _KERNEL - -/* Ensure libmd symbols do not clash with libcrypto */ - -#ifndef MD4Init -#define MD4Init _libmd_MD4Init -#endif -#ifndef MD4Update -#define MD4Update _libmd_MD4Update -#endif -#ifndef MD4Pad -#define MD4Pad _libmd_MD4Pad -#endif -#ifndef MD4Final -#define MD4Final _libmd_MD4Final -#endif -#ifndef MD4End -#define MD4End _libmd_MD4End -#endif -#ifndef MD4Fd -#define MD4Fd _libmd_MD4Fd -#endif -#ifndef MD4FdChunk -#define MD4FdChunk _libmd_MD4FdChunk -#endif -#ifndef MD4File -#define MD4File _libmd_MD4File -#endif -#ifndef MD4FileChunk -#define MD4FileChunk _libmd_MD4FileChunk -#endif -#ifndef MD4Data -#define MD4Data _libmd_MD4Data -#endif - -#endif - -__BEGIN_DECLS -void MD4Init(MD4_CTX *); -void MD4Update(MD4_CTX *, const unsigned char *, unsigned int); -void MD4Pad(MD4_CTX *); -void MD4Final(unsigned char [__min_size(16)], MD4_CTX *); -#ifndef _KERNEL -char * MD4End(MD4_CTX *, char *); -char * MD4Fd(int, char *); -char * MD4FdChunk(int, char *, off_t, off_t); -char * MD4File(const char *, char *); -char * MD4FileChunk(const char *, char *, off_t, off_t); -char * MD4Data(const void *, unsigned int, char *); -#endif -__END_DECLS - -#endif /* _SYS_MD4_H_ */