[patch] patch to rename shipped libthrift to libmdbthrift

mariadb-10.6.17-vendored_thrift.patch (text/plain), 1.76 KB, created by François Bissey on 2024-11-26 20:03:00 UTC

diff --git a/storage/columnstore/columnstore/CMakeLists.txt b/storage/columnstore/columnstore/CMakeLists.txt
index ae580d1b..7cdda675 100644
--- a/storage/columnstore/columnstore/CMakeLists.txt
+++ b/storage/columnstore/columnstore/CMakeLists.txt
@@ -229,7 +229,7 @@ SET (ENGINE_DT_LIB datatypes)
 SET (ENGINE_COMMON_LIBS     messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt libmysql_client ${ENGINE_DT_LIB})
 SET (ENGINE_OAM_LIBS        oamcpp)
 SET (ENGINE_BRM_LIBS        brm idbdatafile cacheutils rwlock ${ENGINE_OAM_LIBS} ${ENGINE_COMMON_LIBS})
-SET (ENGINE_EXEC_LIBS       joblist execplan windowfunction joiner rowgroup funcexp udfsdk regr dataconvert common compress querystats querytele thrift threadpool ${ENGINE_BRM_LIBS})
+SET (ENGINE_EXEC_LIBS       joblist execplan windowfunction joiner rowgroup funcexp udfsdk regr dataconvert common compress querystats querytele mdbthrift threadpool ${ENGINE_BRM_LIBS})
 SET (ENGINE_WRITE_LIBS      ddlpackageproc ddlpackage dmlpackageproc dmlpackage writeengine writeengineclient idbdatafile cacheutils ${ENGINE_EXEC_LIBS})
 
 SET (ENGINE_COMMON_LDFLAGS  "")
diff --git a/storage/columnstore/columnstore/utils/thrift/CMakeLists.txt b/storage/columnstore/columnstore/utils/thrift/CMakeLists.txt
index 70959047..509b177b 100644
--- a/storage/columnstore/columnstore/utils/thrift/CMakeLists.txt
+++ b/storage/columnstore/columnstore/utils/thrift/CMakeLists.txt
@@ -14,7 +14,7 @@ set(thrift_LIB_SRCS
 
 add_definitions(-DTHRIFT_SQUELCH_CONSOLE_OUTPUT)
 
-add_library(thrift SHARED ${thrift_LIB_SRCS})
+add_library(mdbthrift SHARED ${thrift_LIB_SRCS})
 
-install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(TARGETS mdbthrift DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)