From nobody Sat Aug 16 19:19:58 2025 X-Original-To: dev-commits-ports-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 4c481p6V0Vz64pVL; Sat, 16 Aug 2025 19:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c481p4PNXz45dh; Sat, 16 Aug 2025 19:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755371998; 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=qo4CDoGfL3bvly2mobIY+hufqyphlkosqIoZGUk1eFY=; b=tfPWx/jyfBIVm2YLT+JPlJUX96nh1cOnrqBKlPqKMurFq4OqYZGn1GHWyI7tCtxdsTMyU0 bBMNWnJxmwW3lpJhJf+I3AqPLvqY2xh2qnyNFX72tIbCTjCxz3BCcqklT8CKOycckhjuLi yvc04C5qkTiOSHmtKbM9jXMlGwaWGMaOA9UL144RrladuS6SLYOZRQHFkmNqomPx5cRpyb R1XhdMmNhaZACNiN5wLWyWADjf+h+cTsZWGQYf/rLiN0b9PK3YfjUNL/bNwLHNC3MZ5qyZ u7lSYO16rvGa1yVtrxZichLZ0XHd+Lh2h0R2n7ePHLvuLelNcjL4UaapuQKAXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755371998; 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=qo4CDoGfL3bvly2mobIY+hufqyphlkosqIoZGUk1eFY=; b=rd5frFMEfD6fPyCDi3g8kZe0AqLH8FXYAdRSWnj24Mq+vpPaw2zYAuKk48OJZwkNANVEoX xWjluEX6+uhVPW7mStaH3uYLfcnliuddPAsbbPuwTukRxWw5y1TmTi/hNUIjcOduSn3zpc SaZ1dIqHrXzY04MTCS58/bWVkNyGddVO26ixCo7IxDnB/CGFvzmfGO6rNalsQQZHzH8Tem 0Md3qUV2CfC0BSmJ63xMvmIMkEEeSUHZ7uwtk/4vWs2oLjtklnxtoOHYaY9/U1Dh7CTRPp VYjt1ipjiOk5xmEgThez6VUP+5d9u44xjwTaSiizsonvp1TSzwizehNS30kP+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755371998; a=rsa-sha256; cv=none; b=x1sox0ixK4HYaaT14h5dJ/0vGJN5fIXsIcrpcxU6ntVxD6pLtoKf3IBCzRsZggPrXHZlDz QlU8ewvNjmosrZ9VeXbo0rADr7QyqKvLUlIpxe7ow5F50maQhp73xpI6ynMlGZyIWH0Su4 QMm5RXBqU3CsT+wNT85vev7d72Xl6N1/OIqVZ/HP4GQcTii3D5boEPYpJP5UJgkq1+jgAq qb0YGmhzHHGK7Hf7AHs6NLQKZWBR9iJSbvzryvsIL8H5a+G4rAxqENs7amzJvVvgy0YUNk horqhLnva26tSQEv0bOLS/FVvQ44RyejpeBtGHd4NXJN/RDeIBYdFGcuVgWmrg== 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 4c481p3n7gzdRh; Sat, 16 Aug 2025 19:19: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 57GJJw82063386; Sat, 16 Aug 2025 19:19:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57GJJwgH063383; Sat, 16 Aug 2025 19:19:58 GMT (envelope-from git) Date: Sat, 16 Aug 2025 19:19:58 GMT Message-Id: <202508161919.57GJJwgH063383@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: db49a5a07bb2 - 2025Q3 - filesystems/mergerfs: fix build on 32 bit platforms List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q3 X-Git-Reftype: branch X-Git-Commit: db49a5a07bb2258b43324fed115b2d653f1e0e77 Auto-Submitted: auto-generated The branch 2025Q3 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=db49a5a07bb2258b43324fed115b2d653f1e0e77 commit db49a5a07bb2258b43324fed115b2d653f1e0e77 Author: Robert Clausecker AuthorDate: 2025-08-16 09:08:34 +0000 Commit: Robert Clausecker CommitDate: 2025-08-16 19:19:46 +0000 filesystems/mergerfs: fix build on 32 bit platforms There was a type confusion in a compatibility stub. It accidentially works on 64 bit platforms, but never on 32 bit platforms. Approved by: portmgr (build fix blanket) MFH: 2025Q3 (cherry picked from commit a4c0259a29c7cd77888805642fdc881e460a833d) --- filesystems/mergerfs/Makefile | 2 -- .../files/patch-src_fs__copy__file__range__unsupported.icpp | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/filesystems/mergerfs/Makefile b/filesystems/mergerfs/Makefile index 288a63552490..b774e71a4d12 100644 --- a/filesystems/mergerfs/Makefile +++ b/filesystems/mergerfs/Makefile @@ -10,8 +10,6 @@ WWW= https://github.com/trapexit/mergerfs LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -NOT_FOR_ARCHS= i386 - USES= fuse gmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= trapexit diff --git a/filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp b/filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp new file mode 100644 index 000000000000..05a307ab97bf --- /dev/null +++ b/filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp @@ -0,0 +1,11 @@ +--- src/fs_copy_file_range_unsupported.icpp.orig 2025-08-16 08:24:30 UTC ++++ src/fs_copy_file_range_unsupported.icpp +@@ -31,7 +31,7 @@ namespace fs + int64_t *off_in_, + const int fd_out_, + int64_t *off_out_, +- const size_t len_, ++ const uint64_t len_, + const unsigned int flags_) + { + return (errno=EOPNOTSUPP,-1);