git: a4c0259a29c7 - main - filesystems/mergerfs: fix build on 32 bit platforms
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 16 Aug 2025 19:19:04 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a4c0259a29c7cd77888805642fdc881e460a833d
commit a4c0259a29c7cd77888805642fdc881e460a833d
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2025-08-16 09:08:34 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-08-16 19:17:38 +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
---
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);