From f11a7bc14bc318fac6a2dde1bc9b95dfd694d03d Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Sun, 31 May 2026 16:35:56 +0200 Subject: [PATCH] dev-db/mariadb: backport boost patch for old slots Bug: https://bugs.gentoo.org/971594 Signed-off-by: Nicolas PARLANT Part-of: https://codeberg.org/gentoo/gentoo/pulls/1026 Signed-off-by: Sam James --- .../mariadb-10.6.24-fix_boost_system.patch | 42 +++++++++++++++++++ .../mariadb-11.4.9-fix_boost_system.patch | 38 +++++++++++++++++ dev-db/mariadb/mariadb-10.11.15-r1.ebuild | 1 + dev-db/mariadb/mariadb-10.6.24-r1.ebuild | 1 + dev-db/mariadb/mariadb-11.4.9-r1.ebuild | 1 + dev-db/mariadb/mariadb-11.8.6.ebuild | 1 + 6 files changed, 84 insertions(+) create mode 100644 dev-db/mariadb/files/mariadb-10.6.24-fix_boost_system.patch create mode 100644 dev-db/mariadb/files/mariadb-11.4.9-fix_boost_system.patch diff --git a/dev-db/mariadb/files/mariadb-10.6.24-fix_boost_system.patch b/dev-db/mariadb/files/mariadb-10.6.24-fix_boost_system.patch new file mode 100644 index 0000000000000..027c66c561709 --- /dev/null +++ b/dev-db/mariadb/files/mariadb-10.6.24-fix_boost_system.patch @@ -0,0 +1,42 @@ +fixed by upstream https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/3943.patch +https://bugs.gentoo.org/971594 +fix building against boost >=1.89 +--- a/storage/columnstore/columnstore/CMakeLists.txt ++++ b/storage/columnstore/columnstore/CMakeLists.txt +@@ -97,7 +97,7 @@ SET (ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + INCLUDE(columnstore_version) + INCLUDE(misc) + +-FIND_PACKAGE(Boost 1.53.0 COMPONENTS system filesystem thread regex date_time chrono atomic) ++FIND_PACKAGE(Boost 1.53.0 COMPONENTS filesystem thread regex date_time chrono atomic) + IF (NOT Boost_FOUND) + MESSAGE_ONCE(CS_NO_BOOST "Required Boost libraries not found!") + return() +--- a/storage/columnstore/columnstore/cmake/boost.cmake ++++ b/storage/columnstore/columnstore/cmake/boost.cmake +@@ -31,4 +31,4 @@ unset(_exec_ret) + + set(BOOST_ROOT ${CMAKE_CURRENT_BINARY_DIR}/boost) + +-find_package(Boost 1.55.0 REQUIRED COMPONENTS system filesystem thread regex date_time) ++find_package(Boost 1.55.0 REQUIRED COMPONENTS filesystem thread regex date_time) +--- a/storage/columnstore/columnstore/storage-manager/CMakeLists.txt ++++ b/storage/columnstore/columnstore/storage-manager/CMakeLists.txt +@@ -62,7 +62,7 @@ set(CMAKE_INSTALL_RPATH $ORIGIN $ORIGIN/../lib) + add_library(storagemanager SHARED ${storagemanager_SRCS}) + add_dependencies(storagemanager marias3) + target_compile_definitions(storagemanager PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) +-target_link_libraries(storagemanager boost_chrono boost_system boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS}) ++target_link_libraries(storagemanager boost_chrono boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS}) + set_property(TARGET storagemanager PROPERTY CXX_STANDARD 11) + + add_executable(StorageManager src/main.cpp) +--- a/storage/columnstore/columnstore/tools/rebuildEM/CMakeLists.txt ++++ b/storage/columnstore/columnstore/tools/rebuildEM/CMakeLists.txt +@@ -2,5 +2,5 @@ include_directories(${ENGINE_COMMON_INCLUDES}) + + set(rebuildEM_SRCS main.cpp rebuildEM.cpp) + add_executable(mcsRebuildEM ${rebuildEM_SRCS}) +-target_link_libraries(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${MARIADB_CLIENT_LIBS} boost_filesystem boost_system) ++target_link_libraries(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${MARIADB_CLIENT_LIBS} boost_filesystem) + install(TARGETS mcsRebuildEM DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine) diff --git a/dev-db/mariadb/files/mariadb-11.4.9-fix_boost_system.patch b/dev-db/mariadb/files/mariadb-11.4.9-fix_boost_system.patch new file mode 100644 index 0000000000000..032493b49ed5f --- /dev/null +++ b/dev-db/mariadb/files/mariadb-11.4.9-fix_boost_system.patch @@ -0,0 +1,38 @@ +fixed by upstream https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/3943.patch +https://bugs.gentoo.org/971594 +fix building against boost >=1.89 +--- a/storage/columnstore/columnstore/cmake/boost.cmake ++++ b/storage/columnstore/columnstore/cmake/boost.cmake +@@ -1,5 +1,5 @@ + # Single source of truth for Boost components we need +-set(BOOST_COMPONENTS chrono filesystem program_options regex system thread) ++set(BOOST_COMPONENTS chrono filesystem program_options regex thread) + + find_package(Boost 1.88.0 COMPONENTS ${BOOST_COMPONENTS}) + +--- a/storage/columnstore/columnstore/storage-manager/CMakeLists.txt ++++ b/storage/columnstore/columnstore/storage-manager/CMakeLists.txt +@@ -71,7 +71,6 @@ target_compile_definitions(storagemanager PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) + columnstore_link( + storagemanager + boost_chrono +- boost_system + boost_thread + boost_filesystem + boost_regex +--- a/storage/columnstore/columnstore/tools/rebuildEM/CMakeLists.txt ++++ b/storage/columnstore/columnstore/tools/rebuildEM/CMakeLists.txt +@@ -2,4 +2,4 @@ include_directories(${ENGINE_COMMON_INCLUDES}) + + set(rebuildEM_SRCS main.cpp rebuildEM.cpp) + columnstore_executable(mcsRebuildEM ${rebuildEM_SRCS}) +-columnstore_link(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} boost_system boost_filesystem) ++columnstore_link(mcsRebuildEM ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} boost_filesystem) +--- a/storage/columnstore/columnstore/utils/idbdatafile/CMakeLists.txt ++++ b/storage/columnstore/columnstore/utils/idbdatafile/CMakeLists.txt +@@ -14,4 +14,4 @@ set(idbdatafile_LIB_SRCS + ) + + columnstore_library(idbdatafile ${idbdatafile_LIB_SRCS}) +-columnstore_link(idbdatafile PRIVATE ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS} boost_filesystem boost_system) ++columnstore_link(idbdatafile PRIVATE ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS} boost_filesystem) diff --git a/dev-db/mariadb/mariadb-10.11.15-r1.ebuild b/dev-db/mariadb/mariadb-10.11.15-r1.ebuild index e8caf73a26af8..87b5460e776c1 100644 --- a/dev-db/mariadb/mariadb-10.11.15-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.11.15-r1.ebuild @@ -223,6 +223,7 @@ src_prepare() { eapply "${WORKDIR}"/mariadb-patches eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch eapply "${FILESDIR}"/${PN}-wsrep-gcc-15.patch + eapply "${FILESDIR}"/${PN}-10.6.24-fix_boost_system.patch eapply_user diff --git a/dev-db/mariadb/mariadb-10.6.24-r1.ebuild b/dev-db/mariadb/mariadb-10.6.24-r1.ebuild index 0d55d2b72a5b5..4c7087a8018bd 100644 --- a/dev-db/mariadb/mariadb-10.6.24-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.6.24-r1.ebuild @@ -235,6 +235,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch eapply "${FILESDIR}"/${PN}-10.6.21-debug.patch eapply "${FILESDIR}"/${PN}-wsrep-gcc-15.patch + eapply "${FILESDIR}"/${PN}-10.6.24-fix_boost_system.patch eapply_user diff --git a/dev-db/mariadb/mariadb-11.4.9-r1.ebuild b/dev-db/mariadb/mariadb-11.4.9-r1.ebuild index cd007f29185dc..fa30a2980a60d 100644 --- a/dev-db/mariadb/mariadb-11.4.9-r1.ebuild +++ b/dev-db/mariadb/mariadb-11.4.9-r1.ebuild @@ -224,6 +224,7 @@ src_prepare() { eapply "${WORKDIR}"/mariadb-patches eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch eapply "${FILESDIR}"/${PN}-wsrep-gcc-15.patch + eapply "${FILESDIR}"/${PN}-11.4.9-fix_boost_system.patch eapply_user diff --git a/dev-db/mariadb/mariadb-11.8.6.ebuild b/dev-db/mariadb/mariadb-11.8.6.ebuild index adffd7a970057..a978a1b548607 100644 --- a/dev-db/mariadb/mariadb-11.8.6.ebuild +++ b/dev-db/mariadb/mariadb-11.8.6.ebuild @@ -214,6 +214,7 @@ src_prepare() { eapply "${WORKDIR}"/mariadb-patches eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch eapply "${FILESDIR}"/${PN}-wsrep-gcc-15.patch + eapply "${FILESDIR}"/${PN}-11.4.9-fix_boost_system.patch eapply_user