From 979af00b7c0066b0c3c8167fad015bf1325c5b0d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 4 Aug 2020 22:55:47 +0200 Subject: [PATCH] Move ColumnStore dependency on jemalloc from rpm Requires: to Recommends: this makes it a weak dependency, signalling that ColumnStore can work without jemalloc and that while jemalloc is desired, missing jemalloc is not a fatal error. --- storage/columnstore/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt index f71cce38bd8..261315583d2 100644 --- a/storage/columnstore/CMakeLists.txt +++ b/storage/columnstore/CMakeLists.txt @@ -22,7 +22,8 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686") # Needed to bump the component changes up to the main scope APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL) IF (RPM) - APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES " binutils jemalloc net-tools python3") + APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES " binutils net-tools python3") + 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") # these three don't have the list semantics, so no append here