From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4994B15800F for ; Tue, 17 Jan 2023 01:26:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 853DBE0809; Tue, 17 Jan 2023 01:26:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68286E0809 for ; Tue, 17 Jan 2023 01:26:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4307133BF29 for ; Tue, 17 Jan 2023 01:26:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E4817DE for ; Tue, 17 Jan 2023 01:26:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1673918707.61cd8db06de869a6f52a4ab93c6e2b5a282e29a9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/, dev-db/mariadb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/files/mariadb-10.6.11-include.patch dev-db/mariadb/mariadb-10.6.11.ebuild X-VCS-Directories: dev-db/mariadb/files/ dev-db/mariadb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 61cd8db06de869a6f52a4ab93c6e2b5a282e29a9 X-VCS-Branch: master Date: Tue, 17 Jan 2023 01:26:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6d6bdc09-8bdb-42a0-8b05-a0f2d6ef6f70 X-Archives-Hash: d29e5966db8e942c72247d1dc793d886 commit: 61cd8db06de869a6f52a4ab93c6e2b5a282e29a9 Author: Sam James gentoo org> AuthorDate: Tue Jan 17 01:25:07 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 17 01:25:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cd8db0 dev-db/mariadb: fix columnstore build Signed-off-by: Sam James gentoo.org> dev-db/mariadb/files/mariadb-10.6.11-include.patch | 66 ++++++++++++++++++++++ dev-db/mariadb/mariadb-10.6.11.ebuild | 1 + 2 files changed, 67 insertions(+) diff --git a/dev-db/mariadb/files/mariadb-10.6.11-include.patch b/dev-db/mariadb/files/mariadb-10.6.11-include.patch new file mode 100644 index 000000000000..600f440b85f0 --- /dev/null +++ b/dev-db/mariadb/files/mariadb-10.6.11-include.patch @@ -0,0 +1,66 @@ +https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/2698 + +From 20b5dbb6171604b151ec2dd8c56bef26cc27d201 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 17 Jan 2023 01:18:41 +0000 +Subject: [PATCH] Add missing includes + +These seem to have all fallen out of a recent Boost update to 1.81 which +dropped some internal includes. All of these uses within columnstore +relied on these transitive includes, so explicitly include what we need +to fix build. + +Signed-off-by: Sam James + +--- a/storage/columnstore/columnstore/tools/passwd/secrets.cpp ++++ b/storage/columnstore/columnstore/tools/passwd/secrets.cpp +@@ -12,6 +12,8 @@ + */ + #include "secrets.h" + ++#include ++#include + #include + #include + #include +--- a/storage/columnstore/columnstore/storage-manager/src/S3Storage.h ++++ b/storage/columnstore/columnstore/storage-manager/src/S3Storage.h +@@ -18,6 +18,7 @@ + #ifndef S3STORAGE_H_ + #define S3STORAGE_H_ + ++#include + #include + #include + #include "CloudStorage.h" +--- a/storage/columnstore/columnstore/storage-manager/src/MetadataFile.cpp ++++ b/storage/columnstore/columnstore/storage-manager/src/MetadataFile.cpp +@@ -19,6 +19,7 @@ + * MetadataFile.cpp + */ + #include "MetadataFile.h" ++#include + #include + #define BOOST_SPIRIT_THREADSAFE + #include +--- a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h ++++ b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h +@@ -19,6 +19,7 @@ + + #ifndef HA_MCS_IMPL_IF_H__ + #define HA_MCS_IMPL_IF_H__ ++#include + #include + #include + #ifdef _MSC_VER +--- a/storage/columnstore/columnstore/utils/cloudio/SocketPool.h ++++ b/storage/columnstore/columnstore/utils/cloudio/SocketPool.h +@@ -18,6 +18,8 @@ + #ifndef _SOCKETPOOL_H_ + #define _SOCKETPOOL_H_ + ++#include ++ + #include + #include + #include diff --git a/dev-db/mariadb/mariadb-10.6.11.ebuild b/dev-db/mariadb/mariadb-10.6.11.ebuild index 31285154561e..095305883bb9 100644 --- a/dev-db/mariadb/mariadb-10.6.11.ebuild +++ b/dev-db/mariadb/mariadb-10.6.11.ebuild @@ -208,6 +208,7 @@ src_unpack() { src_prepare() { eapply "${WORKDIR}"/mariadb-patches eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch + eapply "${FILESDIR}"/mariadb-10.6.11-include.patch eapply_user