From nobody Sat Aug 31 08:13:06 2024 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 4Wwnnt5z2Tz5TqlK; Sat, 31 Aug 2024 08:13:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wwnnt59SYz4nlw; Sat, 31 Aug 2024 08:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725091986; 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=m8zCQobxiYhK+bAZB01m7a0DICoXOijasjBkLwaWWus=; b=IpJvD5Lx0Xe2EkiIpXdVHasL6MnUnChQ8+ZLqxFCI8H5G/94ANJsPeMA/7jteKmXHeN2Zk U6DBho458xOoQfLye6TgYE+SsRjh+v0wjVGY5HTb4KMDJjuOTp45OSRtlNH/Vvqm9rBbel IXBYdj9+pm+R1bDsk9JLvVtf5SzAnN7pv/IrO5Iaw1edss1ttQZ40ckvLivIGBA07b+pa7 ysHbdirMe9TEllZQmp8E8elzqs+VeCRdNtseKIi0fSCRbjBcgAVHiqKYrjb/GfYUzWlnTE fqRkvr8Q/7Q+ZMhAiaDwyst04YOoBMXl4qN6Ebm8/iQ+7JdLtFpu9tz7kkayYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725091986; a=rsa-sha256; cv=none; b=NUlhUSDw4PAtqmokIsmTLYnqlXtjBinNFHgnd4EQxFSLKwn/XKQAMmj1jyaZTv1xcLedUj +lf5a8I27hGKbf8CSPuVkP37ab293sB1bKrA4yGFng53XJ2FQF1APX/QAB4Iq5UXlJrl2j LImaHAbetn24U99jhPKOTcaiu9LXwnZ/G5z2mDM076q0clQEoAkpRWqWx6Uwm6G0Dv43T6 zuleA9VNX9ybWYP+LIEUejTRURc/6Erl/zgTcFaIzlKRrI2dBE5jC8eixkPunqPWQp/v74 AkxFVR0tdkq5C8xzpe1G4PN6jcXRm3eDAv+JLTG4gdL7SH6+euD7WEDQJXHURw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725091986; 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=m8zCQobxiYhK+bAZB01m7a0DICoXOijasjBkLwaWWus=; b=KwjFJLzkS4HLqWGFd8yNjGFb5ptC+ldgfbCSyO1mfNLLQvPWP8RGVmvJ8TXjP+265rWYGs QznizKpA22bBY1GwZAkNewyU7oSjc6mat2iyTigrIDyHjD+G3hO14smVtVDd8JPEyEn5Ph 0nNr8w0SiDuykepNPO90e9opEH4qlRpbBitKeNI5SrL+Ygvbqs0Mwg00n/WFB4T2Os1hG8 6A0e0T3THj1tbnFmiy5Bom/DJMmm9K0i4ZuTzp+p5Lfqkvr1+7s+dFNV0i3ZsHFTwHaUZ4 JCx4ip7I3p+/VP5e8SF2XImfSPCFSphLoc6r4Nng3tPQz7N63CHyG9hwyPy8PA== 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 4Wwnnt4mz8zdJg; Sat, 31 Aug 2024 08:13:06 +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 47V8D6MW069360; Sat, 31 Aug 2024 08:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47V8D6tn069357; Sat, 31 Aug 2024 08:13:06 GMT (envelope-from git) Date: Sat, 31 Aug 2024 08:13:06 GMT Message-Id: <202408310813.47V8D6tn069357@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: e481ca786b0d - main - databases/mysql80-server: fix build for i386 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e481ca786b0daca6c4252fa065154aef0ab328bd Auto-Submitted: auto-generated The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=e481ca786b0daca6c4252fa065154aef0ab328bd commit e481ca786b0daca6c4252fa065154aef0ab328bd Author: Jochen Neumeister AuthorDate: 2024-08-31 08:11:30 +0000 Commit: Jochen Neumeister CommitDate: 2024-08-31 08:12:55 +0000 databases/mysql80-server: fix build for i386 --- storage/innobase/CMakeFiles/innodb_zipdecompress.dir/all --- /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:466:39: error: no member named 'meta_1' in 'ut::detail::Aligned_alloc_metadata' 466 | auto offset = allocator_metadata::meta_1(data); | ~~~~~~~~~~~~~~~~~~~~^ /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:593:25: error: no member named 'meta_1' in 'ut::detail::Aligned_alloc_metadata' 593 | allocator_metadata::meta_1(ret.first, ret.second); | ~~~~~~~~~~~~~~~~~~~~^ /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:594:25: error: no member named 'meta_2' in 'ut::detail::Aligned_alloc_metadata' 594 | allocator_metadata::meta_2(ret.first, size); | ~~~~~~~~~~~~~~~~~~~~^ /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:655:32: error: no member named 'meta_2' in 'ut::detail::Aligned_alloc_metadata' 655 | return allocator_metadata::meta_2(pfs_metadata::deduce_pfs_meta(data)); | ~~~~~~~~~~~~~~~~~~~~^ /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:668:39: error: no member named 'meta_1' in 'ut::detail::Aligned_alloc_metadata' 668 | auto offset = allocator_metadata::meta_1(pfs_meta); | ~~~~~~~~~~~~~~~~~~~~^ PR: 280541 Sponsored by: Netzkommune GmbH --- .../patch-storage_innobase_include_details_ut_aligned_alloc.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/databases/mysql80-server/files/patch-storage_innobase_include_details_ut_aligned_alloc.h b/databases/mysql80-server/files/patch-storage_innobase_include_details_ut_aligned_alloc.h new file mode 100644 index 000000000000..2175a4398307 --- /dev/null +++ b/databases/mysql80-server/files/patch-storage_innobase_include_details_ut_aligned_alloc.h @@ -0,0 +1,11 @@ +--- storage/innobase/include/detail/ut/aligned_alloc.h.orig 2024-08-29 18:34:56.237736000 +0200 ++++ storage/innobase/include/detail/ut/aligned_alloc.h 2024-08-29 18:35:34.091577000 +0200 +@@ -55,7 +55,7 @@ struct Aligned_alloc_impl { + whatever arbitrary data. See Aligned_alloc and Aligned_alloc_arr for + exemplary usages of it. + */ +- static constexpr uint32_t metadata_size = alignof(max_align_t); ++ static constexpr uint32_t metadata_size = alignof(max_align_t) < (2 * alignof(uint32_t)) ? (2 * alignof(uint32_t)) : alignof(max_align_t); + + /** Alias that we will be using to denote ptr to DATA segment. */ + using data_segment_ptr = void *;