summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Nozdrin <r.nozdrin@mariadb.com>2021-04-05 20:15:39 +0000
committerRoman Nozdrin <r.nozdrin@mariadb.com>2021-04-05 20:15:39 +0000
commitec31530cf0e49732fb358c4d241d4841fb41f181 (patch)
tree0d4de6b765e4fd4cb7e5d1464af7b7132f9f5dd8
parent7f75acc05c54bb4a2ffd0c38c7171e27c271bdb2 (diff)
downloadmariadb-git-bb-10.5-drrtuy.tar.gz
Fix for an external library TBBbb-10.5-drrtuy
-rw-r--r--storage/columnstore/CMakeLists.txt1
m---------storage/columnstore/columnstore0
2 files changed, 1 insertions, 0 deletions
diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
index 6a6d91b18fe..5fe058206dc 100644
--- a/storage/columnstore/CMakeLists.txt
+++ b/storage/columnstore/CMakeLists.txt
@@ -20,6 +20,7 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL)
IF (RPM)
APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES " binutils net-tools python3")
+ APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_PROVIDES " libtbb.so.12()(64bit) ")
APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_RECOMMENDS " jemalloc")
APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_USER_FILELIST ";%ignore /var/lib;%ignore /var")
APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_CONFLICTS " thrift MariaDB-columnstore-platform MariaDB-columnstore-libs")
diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore
-Subproject a37a46c10286218d9109c1832c9fcd89a90784e
+Subproject 4c98f727514e9ca3fb7c3d5587912a14d6f811f