From nobody Sat Aug 16 19:19:04 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 4c480m4k9gz64pPl; Sat, 16 Aug 2025 19:19:04 +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 4c480m2gTxz44s9; Sat, 16 Aug 2025 19:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755371944; 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=lJpiKN4IvtHa0Vs19pAzOcUAsBaGAZaXirnOlMa698E=; b=N+0OR+/Sclno1EQe4GBixPiAw2HKCoY6sTyE09IzkNbyGdWd0myZsxqEJVVOu9IHYF9kKU hPYCXfCgVmcjIl8Hmn7dvjvvqktTEv7Jr286v0Xp7UBhOuwvyJ/sJu3LyfTRlqqssqJs2s X9RtI/QXd6zo2gN4R+aq3AoHUC2SR8XPV2yu+B3ekDgbm27tNzkDchPhXJf+ctXL9rjokX OV+xt3GH7iKjKiXuvisCAIB67aqPrUCDeJlRdfYkgt16zt8Ct39cPMghItAMfuvtExSEAj GuZGokTN7dEoV/apqSUX0JtknRFbFv04jVheGYC12jPGRukYZCNValpMpQhkIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755371944; 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=lJpiKN4IvtHa0Vs19pAzOcUAsBaGAZaXirnOlMa698E=; b=bwqn5LYlfv3gbcgZqzR7dcXq6YeE/cVP13h2U+a3/P6Bfsy3GsL5vdBaXkk0uer5zPmyla RJMo/x+QwJCHkpUmW366o3m/aCmZ2YtIKFgTjrbgG/o5teR/M4DimWjWFCdyrxH2VAxWxG CVkm9lvdlIUoW4KN9lHkwCYX7JgLBoCoB0INK6oPpXjaNEhUuzSRpeBbZwlVFFPJaVDV0z BEaj5+m8rl3t6bhLXhAzD/OT35FHl/0P9upZ5SELWHvsHEbA/EB0qyCKtLoTcTjSwdKeWB toQ/wDKO6YDWuYAma70xDSzXDVJJUroLES4OF7YEZTo6DtT5FVCHshdkQEiT9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755371944; a=rsa-sha256; cv=none; b=krOsYH7RZNBsAttPcecv4ZiF3nPEqCCb9LVGTKhO4cyUDYO9xs1mkA60E1H2Y92ZchERxo p5L+s2wsP3iPmyL7TB/6VBTKX3dEmkFoOE6BWszMfntXtlG2prFmpKOrEOPGH3CvegV7bE woocBHoesE+l+JiZWVo8hzm3AynOft7Kkw8Ia/ERhqLHwwgdq0JEyJ5t6/2wuu/dOVfcal BetWDDs6/K9/vrODrs4LpdjNRE55GnR+Xno85n577pBUpVnbN9w5Ug4j03qGpG58TpvWkc BAgBJloQGscJbygQ9bZCWhJNw4H1xqHOW1dxVfRESaJ2q08LpmcQ9Sow9ozw6Q== 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 4c480m20Pnzcnb; Sat, 16 Aug 2025 19:19:04 +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 57GJJ4kg062724; Sat, 16 Aug 2025 19:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57GJJ4RH062721; Sat, 16 Aug 2025 19:19:04 GMT (envelope-from git) Date: Sat, 16 Aug 2025 19:19:04 GMT Message-Id: <202508161919.57GJJ4RH062721@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: a4c0259a29c7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: a4c0259a29c7cd77888805642fdc881e460a833d Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a4c0259a29c7cd77888805642fdc881e460a833d commit a4c0259a29c7cd77888805642fdc881e460a833d Author: Robert Clausecker AuthorDate: 2025-08-16 09:08:34 +0000 Commit: Robert Clausecker 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);