diff options
| author | Patrick LeBlanc <patrick.leblanc@mariadb.com> | 2020-06-26 11:29:12 -0400 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-07-01 08:48:05 +0200 |
| commit | 04df0bdae7313965d85b3127d3fe48b4b01ad257 (patch) | |
| tree | 11bf72c1e3ec4273e2904784af7824756c8acb98 /storage/columnstore | |
| parent | baca526555e83567cc2a894ba610ff37b8b47cd6 (diff) | |
| download | mariadb-git-04df0bdae7313965d85b3127d3fe48b4b01ad257.tar.gz | |
A few important fixes for columnstore.
- fix columnstore's python dependencies (MCOL-4114)
- reduce compiler warning count from 14k to ~100 (MCOL-4030)
- disable bintar builds
Diffstat (limited to 'storage/columnstore')
| -rw-r--r-- | storage/columnstore/CMakeLists.txt | 8 | ||||
| m--------- | storage/columnstore/columnstore | 0 |
2 files changed, 1 insertions, 7 deletions
diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt index 8e3db1c7964..783c17d3c24 100644 --- a/storage/columnstore/CMakeLists.txt +++ b/storage/columnstore/CMakeLists.txt @@ -17,13 +17,7 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686") IF (RPM) SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE) # To untie the python mess across distributions MCS supports. - IF(RPM MATCHES "(rhel|centos)8|(sles|suse)15|fedora") - SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python3, binutils" PARENT_SCOPE) - ELSEIF(RPM MATCHES "(centos|rhel)7|sles12") - SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python, binutils" PARENT_SCOPE) - ELSE() - SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python or python2 or python3, binutils" PARENT_SCOPE) - ENDIF() + SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python3, binutils" PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE} PARENT_SCOPE) diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore -Subproject 410cf29ff2b345a874d38f473e4d64689608066 +Subproject 31df46168d2eb51e524a7f24386f557a809b78d |