mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-31 21:18:09 -07:00
dev-db/mariadb: backport boost patch for old slots
Bug: https://bugs.gentoo.org/971594 Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://codeberg.org/gentoo/gentoo/pulls/1026 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Nicolas PARLANT
committed by
Sam James
Sam James
parent
430d3f3967
commit
f11a7bc14b
42
dev-db/mariadb/files/mariadb-10.6.24-fix_boost_system.patch
Normal file
42
dev-db/mariadb/files/mariadb-10.6.24-fix_boost_system.patch
Normal file
@@ -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)
|
||||
38
dev-db/mariadb/files/mariadb-11.4.9-fix_boost_system.patch
Normal file
38
dev-db/mariadb/files/mariadb-11.4.9-fix_boost_system.patch
Normal file
@@ -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)
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user