aboutsummaryrefslogtreecommitdiffstats
path: root/filesystems
diff options
context:
space:
mode:
authorRobert Clausecker <fuz@FreeBSD.org>2025-08-16 11:08:34 +0200
committerRobert Clausecker <fuz@FreeBSD.org>2025-08-16 21:17:38 +0200
commita4c0259a29c7cd77888805642fdc881e460a833d (patch)
treead933a8ada384b301157f3b44bb192c2d28e26c0 /filesystems
parent165e11b9dd5ddcbfc18fa8ff5b7c204836ae600b (diff)
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
Diffstat (limited to 'filesystems')
-rw-r--r--filesystems/mergerfs/Makefile2
-rw-r--r--filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp11
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);