From nobody Mon Nov 17 16:12:40 2025 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 4d9CSn010nz6GV70; Mon, 17 Nov 2025 16:12:41 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9CSm4pGDz3Q15; Mon, 17 Nov 2025 16:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395960; 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=TF/uRi4ooTksOZYVy61wanNj6gN0r3+Zh5Yp9R/mLEQ=; b=a2xfRDsmYINJ9F4+57m9TryToJG4qEObJ6UxwXqWp6SoVEaL8JJ35rZLfea0j0RtYrx/rP zMiXCqF8NbVGGzDt1siKsu5t/FuRJmIw0ssqyQjyZNvBkWrt090vEj6oXjyesJOGQIc3E/ M05q91ztYBOAat5GX4cjOMCzo82VJp6LnWd/xeDHvSlOdzn4dn1OSveV4thwwCvE4Kqn01 yEQe4ncsrQFkxc5rqijcuD78mdokIni019l/u9SYKyaWZ8aris+AD01kNuAZCANvLu4AnT Fbd1BPChZVr0jNeuK2GfFScEC5zBnx+Rvplr9E1lcgLg0vL8Zur9WApgmX2oyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763395960; 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=TF/uRi4ooTksOZYVy61wanNj6gN0r3+Zh5Yp9R/mLEQ=; b=fdEQ59mCv08VKDJi9rTq0c/KlgfJw4aP+IFrTMB6lTPMF8dSzlOZe//1az7dZr75O1QjMU 9IYUM2f2bsHcC9yw6TALBdmJZEKbxrz6fiRdnaRzAebRiCweRyxa9qBZxnU8r0qbmo6jfI EXB00oHh6Xn8RNsKvhRrYFYLJnUA/434gI0wcPXfogKQS1RTBFt23/hGVW79vsvDFPFuLr 23VxRSvI1SSV9uWwsK0OARYyPYkJS0nk6QuP3ip6FB1/ybRFErMUEIfneTQdQv5JT2lxIu JvBk0faQq9aklBNWLSUicFgbXNKS2ZyL79UqYxPvIgj7gvixcS4d444wm6VQag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763395960; a=rsa-sha256; cv=none; b=fz/PAoSsJgZjQ2PrGhxLxoM5rsBQeRE7AvO35Kq1XrrKT2J10JOYI/DAc8Oofu0yim63XG 6jEocHkbAhcWAa55X/LbpwE+M2KN8jcFNIQ1H2qJOwXgjAfLhB4X2lvjjoGyIKHfhlELBg K3ZEY0BQMmPdFWfhvD01oETL9IO1+48bWXWOOPUhLyzFsE5zsFRIx9gfrGIk0DPX0KW1Bv udRBBeVPT8e0OEsKCZ9lzQpSCdcOybL6cIfFKwv7SF4nyX7kcCP9E8OwMWjSmp/0tdOoyT 83BRm+gh4rINKpE+QhpR3GniMjR9z+xmjYznLcVlMO/P3Jc53A8uROgDOQcivQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d9CSm47hcz1DJ; Mon, 17 Nov 2025 16:12:40 +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 5AHGCe7c068113; Mon, 17 Nov 2025 16:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHGCes5068110; Mon, 17 Nov 2025 16:12:40 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:12:40 GMT Message-Id: <202511171612.5AHGCes5068110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: bb8580e7a6a8 - main - zfs: fix cross-build after openzfs/zfs@e63d026b9d 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb8580e7a6a8c54481d0fd19cac43e84a485f45b Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8580e7a6a8c54481d0fd19cac43e84a485f45b commit bb8580e7a6a8c54481d0fd19cac43e84a485f45b Author: Martin Matuska AuthorDate: 2025-11-17 11:34:01 +0000 Commit: Martin Matuska CommitDate: 2025-11-17 16:12:03 +0000 zfs: fix cross-build after openzfs/zfs@e63d026b9d Workaround multiple cross-build issues in OpenZFS code TBD: discuss long-term fix with OpenZFS --- cddl/lib/libspl/Makefile | 6 +++--- sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h | 2 ++ sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h | 2 ++ sys/contrib/openzfs/lib/libspl/include/sys/random.h | 2 ++ sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index 2c56348cdf9c..173e9116e284 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -14,9 +14,7 @@ SRCS = \ assert.c \ backtrace.c \ condvar.c \ - cred.c \ kmem.c \ - kstat.c \ libspl.c \ list.c \ mkdirp.c \ @@ -28,7 +26,6 @@ SRCS = \ rwlock.c \ sid.c \ taskq.c \ - thread.c \ timestamp.c \ include/sys/list.h \ include/sys/list_impl.h @@ -38,7 +35,10 @@ SRCS = \ .if !defined(BOOTSTRAPPING) SRCS += \ atomic.c \ + cred.c \ getexecname.c \ + kstat.c \ + thread.c \ tunables.c \ os/freebsd/getexecname.c \ os/freebsd/gethostid.c \ diff --git a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h index 64dd4d7ebe45..04fcc9f85c91 100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/fcntl.h @@ -27,7 +27,9 @@ #ifndef _LIBSPL_SYS_FCNTL_H_ #define _LIBSPL_SYS_FCNTL_H_ +#if !defined(__linux__) || !defined(IN_BASE) #include_next +#endif #define O_LARGEFILE 0 #define O_RSYNC 0 diff --git a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h index 231c250d3410..5548ad7d22b2 100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mount.h @@ -29,8 +29,10 @@ #ifndef _LIBSPL_SYS_MOUNT_H #define _LIBSPL_SYS_MOUNT_H +#if !defined(__linux__) || !defined(IN_BASE) #undef _SYS_MOUNT_H_ #include_next +#endif #include #include diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/random.h b/sys/contrib/openzfs/lib/libspl/include/sys/random.h index d11580829ed2..09ca0662d1a3 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/random.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/random.h @@ -39,7 +39,9 @@ random_in_range(uint32_t range) { uint32_t r; +#if !defined(__APPLE__) || !defined(IN_BASE) ASSERT(range != 0); +#endif if (range == 1) return (0); diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h b/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h index cc6edf25a7bc..f67b081c42fa 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h @@ -38,8 +38,10 @@ * have this header, so include_next won't find it and will abort. So, we * protect it with a platform check. */ +#ifndef IN_BASE #include_next #endif +#endif #ifdef __FreeBSD__ #include