From nobody Fri Oct 18 20:39:58 2024
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 4XVc5V2n1dz5Yw4h;
Fri, 18 Oct 2024 20:39:58 +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 4XVc5V2C67z4Jjv;
Fri, 18 Oct 2024 20:39:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1729283998;
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=3tBVJ0s92yF7iXkghN0a+bzdwPRaPVTDEGVNkAEAWsM=;
b=GhlPcXZkGvAPE9jc64sy9vs4mxnDRyms22KIefg29sfdYqmXSD2uGroJj3MnbceXaaXBdb
9YtgkZenR09jyZGJfq9rvcxGLNuCwIRhJSnJDSVi5kk5m7/1gqcwiz59XLBqsi8VJZAKvO
nr+Tz3SKQPuCjNxlfhhCG/QV/rTpILnD2fcr3K8QHEQc6hQERwrNeoL31gk+L4g/oXQxc4
0CYbE8k5SIfB57Jhamzn9lkf3a2bvEeroOkVglbU9o3RTzTHqCl1fSMO4kS7bbbM/oN7X6
x29tdlXM0NcG5EIttrb9P7JtzS/zHxkeZdqodPIrWU/kLppP9jt2W/KDkt0cxA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1729283998;
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=3tBVJ0s92yF7iXkghN0a+bzdwPRaPVTDEGVNkAEAWsM=;
b=d/AyyDgAYcjlsgCIuPPWekPJqU076DApvz1f7jkx931azC7uNWaBbMus++EAfj+Ay2DnD2
FhL2WW1xTJsOgMNj1vtA3i8wT7lXNJhcklY4vtEsBaB661NmibBRBNkt5f8Np0uG+DgwlJ
dvLPqR86M2k8UERN8FudHHoPD2fp3mrlS2aA3Xk7SvFPBZFbrOurMVYNr+5xGSVaa4+Gse
D0UmngrBaln7ktseuoIk4MpPUsc1dLtFuJ6qk134gPNR76uWDio1MEJxaRRCmT40KCpZlv
FfNOucfWurTMAYoMylNTM2r7GmYwfHtaoZUZBDVnNF+JtCUcLV/7ogFVy38nLw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729283998; a=rsa-sha256; cv=none;
b=F3/BIeRWZRPTuaBlCr1LowZGHsDCs/fLwAl/vR849oJGztPxPvpnXnI6NTSIjIMFots0/p
/6nmcd39kSa7khEl1ZpcusSzelvFcllDaaLoZhr4L77MIgarGWYnT40gRI38kmjjrgPcWF
1dtt/dnC6KJQUoeZQqKxpQ2NZyWNgFhI5Tfm2AktzISd1C4WbgmYDF14bTzIwhah2Lk08I
vvvHl2jStXXLqTHZbPpB6Wo23GY1DMm3uTqK8QyrxSn3Wp2F2WDm+5hnmG65pDFV1luhRn
FswqmM23XQvEPa6fnljbiuth75KptPxTp68fbkLXc5gVEj/eooOIsWLGyBCANg==
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 4XVc5V1nt8zp5n;
Fri, 18 Oct 2024 20:39:58 +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 49IKdw8f094184;
Fri, 18 Oct 2024 20:39:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49IKdwFQ094181;
Fri, 18 Oct 2024 20:39:58 GMT
(envelope-from git)
Date: Fri, 18 Oct 2024 20:39:58 GMT
Message-Id: <202410182039.49IKdwFQ094181@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Jessica Clarke <jrtc27@FreeBSD.org>
Subject: git: 0bdf2535d4f8 - main - tools/build/cross-build: Don't
include sys/uio.h from linux limits.h
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-all@freebsd.org
Sender: owner-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: 0bdf2535d4f8a571cb6d230f2f19eb20a452a4f8
Auto-Submitted: auto-generated
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=0bdf2535d4f8a571cb6d230f2f19eb20a452a4f8
commit 0bdf2535d4f8a571cb6d230f2f19eb20a452a4f8
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-10-18 20:39:37 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-10-18 20:39:37 +0000
tools/build/cross-build: Don't include sys/uio.h from linux limits.h
This creates a circular dependency for OpenZFS's libspl in sys/uio.h,
and it shouldn't be needed since the system limits.h already defines
IOV_MAX, so delete it, and unconditionally assert that to be the case.
Otherwise the re-include of libspl's sys/uio.h tries to use PAGESIZE
before it has been defined by OpenZFS's own sys/param.h.
Fixes: 7a7741af18d6 ("zfs: merge openzfs/zfs@b10992582")
MFC after: 1 week
---
tools/build/cross-build/include/linux/limits.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/tools/build/cross-build/include/linux/limits.h b/tools/build/cross-build/include/linux/limits.h
index 5eca34b1120c..4631cabb1104 100644
--- a/tools/build/cross-build/include/linux/limits.h
+++ b/tools/build/cross-build/include/linux/limits.h
@@ -45,13 +45,11 @@
#if !defined(_GNU_SOURCE)
#warning "Attempting to use limits.h with -std=c89/without _GNU_SOURCE, many macros will be missing"
#endif
+#endif /* C89 */
-#else /* Not C89 */
-/* Not C89 -> check that all macros that we expect are defined */
#ifndef IOV_MAX
#error IOV_MAX should be defined
#endif
-#endif /* C89 */
#ifndef MAXBSIZE
#define MAXBSIZE 65536 /* must be power of 2 */
@@ -83,7 +81,6 @@
#endif
#include <sys/types.h>
-#include <sys/uio.h> /* For IOV_MAX */
/* Sanity checks for glibc */
#ifndef _GNU_SOURCE