From nobody Fri Mar 10 10:46:40 2023 X-Original-To: dev-commits-ports-main@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 4PY2mK2HcJz3xNvn; Fri, 10 Mar 2023 10:46:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PY2mK1g55z3CG0; Fri, 10 Mar 2023 10:46:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678445201; 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=O5iaQ6EoD6t0Lzd3IAG76/wh9V43o1/5GBOiGoDWzTg=; b=lWygp03ncfUkqHFoqwlCqbtTaVegZLwPPLzGuRHRcXFKSOqg7inl7y0/SCnMFxHN94/Xhm jJD3+mwOc4vAkS7nBFQX3Q+t0On/dm36GCCt1caYRpFT8OrV4Q1v1yh2Dxaqd2bPO90AkQ kwvl2WmJWY9H/oOG2tsR+YzR9o7EA/5OPQhKnVY6hLxP1Pec3VgxJH1t7exrcukdeYFneo fkwgzkc7ExzsIFN4FIGWuOI6cCd02GXsvTtvYpcwt6uRJ+kKYpmvApLxcCXFyRv2CJqsLj uE5SUqvJuaPJqQrM/+ufgQrXfpPd8AH2b/VsOyCjEUXVbGuusvLUd6J2U9T44A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678445201; 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=O5iaQ6EoD6t0Lzd3IAG76/wh9V43o1/5GBOiGoDWzTg=; b=VKzTuIDe4DygIp0YSdcnVEqvRhAaArcfBHSyttk/5qpZ4OG5YTABhZ/oZG9pzOoGWP86vD fBcDUTNrFbEYRvpf9+iJ9B+VULI2QW2VMgGAGlKvxXNqi7WbiYhS9Czd7zQ4lsEcQz3luX MV2aAi0/R1wl0XvF+w7OzXI3ICIEFKqeq3UCUrlNuv1+dBDBtmTSY1b2gZo4Ys0EE9x5tB stEBHG/yX3x0AsJTaqS4e0Y8ck2FzacA7JnONgq56UTUfYjuqfFGzt9LW3/Q1VbQGX8Kd1 ZVWi04erZMZxTFw6EIT4PArM8lz7cvsU+RxMM+PlFTBSQACOQCN2sEYuhmduAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678445201; a=rsa-sha256; cv=none; b=JAEZggEGOmYUcU0Tv/dJtQ7u5Q6Iv2glD+dPA9cxQK0dT/CaaZrd6W5QTmlr1XO/0r/6bl pknkhaH/qMKHyaHzsU5Pm5cC+O/nYwqsFJGcaEM7Hl8NMdTO2YV7JOX7SjV1S6C33Zo5ia FxDePsVIAFt9OULfVl+7LyU18sYyWFud4/TVNppLywqIW84Rqtvf0IJldM8OwC8eAM0A8t Ca5ZTxO7vreS1E/4Pd/CH8rsQS8bZZv8NdEJyDkEGWwhacv+xknLJxG6T29XkQyXyfgUmq qh5JV9oNXO5SG3ealR6sb/1juhcq6VJoI6q0QUoVf+XIZuSK/Zp1xfSmJmWn3g== 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 4PY2mK0KP2zm1K; Fri, 10 Mar 2023 10:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32AAke70025801; Fri, 10 Mar 2023 10:46:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32AAkeP7025800; Fri, 10 Mar 2023 10:46:40 GMT (envelope-from git) Date: Fri, 10 Mar 2023 10:46:40 GMT Message-Id: <202303101046.32AAkeP7025800@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: 6d631ac4b25d - main - databases/xtrabackup8: fix build for i386 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d631ac4b25d4357f91ce4a28c7c776631cbcf0d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d631ac4b25d4357f91ce4a28c7c776631cbcf0d commit 6d631ac4b25d4357f91ce4a28c7c776631cbcf0d Author: Eugene Grosbein AuthorDate: 2023-03-10 10:43:38 +0000 Commit: Eugene Grosbein CommitDate: 2023-03-10 10:46:31 +0000 databases/xtrabackup8: fix build for i386 Improve alignment fix and backport small code change from MySQL 8.0.32 codebase to fix build for i386. Fixes: d06e12de9aeccfddb388561466ef833a2906d39e --- databases/xtrabackup8/Makefile | 2 +- .../files/patch-storage_innobase_log__log0recv.cc | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/databases/xtrabackup8/Makefile b/databases/xtrabackup8/Makefile index c38b83ce5ee1..0a9a58b0f62a 100644 --- a/databases/xtrabackup8/Makefile +++ b/databases/xtrabackup8/Makefile @@ -62,7 +62,7 @@ WRKSRC= ${WRKDIR}/${PPORTNAME}-${PPORTNAME}-${DVERSION} # which is broken on i386 due to different size of types and causes a # 'static_assert(alignof(T) <= alignof(std::max_align_t))' error .if ${ARCH} == i386 -CMAKE_ARGS+= -DDISABLE_PSI_MEMORY=1 +CXXFLAGS+= -malign-double .endif KEEP_EXTRA= lz4 robin-hood-hashing zlib diff --git a/databases/xtrabackup8/files/patch-storage_innobase_log__log0recv.cc b/databases/xtrabackup8/files/patch-storage_innobase_log__log0recv.cc new file mode 100644 index 000000000000..ad9388decfa4 --- /dev/null +++ b/databases/xtrabackup8/files/patch-storage_innobase_log__log0recv.cc @@ -0,0 +1,29 @@ +--- storage/innobase/log/log0recv.cc.orig 2023-01-30 20:34:34.000000000 +0700 ++++ storage/innobase/log/log0recv.cc 2023-03-10 12:08:29.586971000 +0700 +@@ -3789,7 +3789,7 @@ static bool recv_scan_log_recs(log_t &log, + #else /* !UNIV_HOTBACKUP */ + bool meb_scan_log_recs( + #endif /* !UNIV_HOTBACKUP */ +- size_t *max_memory, const byte *buf, size_t len, ++ size_t max_memory, const byte *buf, size_t len, + lsn_t start_lsn, lsn_t *read_upto_lsn, + dberr_t &err, lsn_t to_lsn) { + const byte *log_block = buf; +@@ -4066,7 +4066,7 @@ bool meb_scan_log_recs( + recv_parse_log_recs(); + + #ifndef UNIV_HOTBACKUP +- if (recv_heap_used() > *max_memory) { ++ if (recv_heap_used() > max_memory) { + recv_apply_hashed_log_recs(log, false); + } + #endif /* !UNIV_HOTBACKUP */ +@@ -4254,7 +4254,7 @@ static dberr_t recv_recovery_begin(log_t &log, const l + + dberr_t err; + +- finished = recv_scan_log_recs(log, &max_mem, log.buf, end_lsn - start_lsn, ++ finished = recv_scan_log_recs(log, max_mem, log.buf, end_lsn - start_lsn, + start_lsn, &log.m_scanned_lsn, err, to_lsn); + + if (err != DB_SUCCESS) {