diff options
| author | Patrick LeBlanc <patrick.leblanc@mariadb.com> | 2020-06-26 11:29:12 -0400 |
|---|---|---|
| committer | Patrick LeBlanc <patrick.leblanc@mariadb.com> | 2020-06-26 11:29:12 -0400 |
| commit | a6b9caa2d9a530dc8e457752492763b2f894958d (patch) | |
| tree | 4f0ccda1be1fb719fd59c607691748dee06e28aa | |
| parent | 994026b77ff3c3d20e6068d23667fd305c995d5b (diff) | |
| download | mariadb-git-leblanc-10.5-cs.tar.gz | |
A few important fixes.leblanc-10.5-cs
- fix columnstore's python dependencies (MCOL-4114)
- reduce compiler warning count from 14k to ~100 (MCOL-4030)
- disable bintar builds
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | storage/columnstore/CMakeLists.txt | 8 | ||||
| m--------- | storage/columnstore/columnstore | 0 |
3 files changed, 2 insertions, 8 deletions
diff --git a/debian/control b/debian/control index c8392fb24e0..19864c6bb1b 100644 --- a/debian/control +++ b/debian/control @@ -658,7 +658,7 @@ Depends: mariadb-server-10.5 (= ${binary:Version}), binutils, libsnappy1 | libsnappy1v5, libjemalloc1 | libjemalloc2, - python | python2 | python3, + python3, ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-columnstore-libs, 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 |