mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

A few important fixes for columnstore.

Browse source 
- fix columnstore's python dependencies (MCOL-4114)
 - reduce compiler warning count from 14k to ~100 (MCOL-4030)
 - disable bintar builds
This commit is contained in:
Patrick LeBlanc 2020-06-26 11:29:12 -04:00 committed by Sergei Golubchik
parent baca526555
commit 04df0bdae7
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/control vendored
View file

@ -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,

8
storage/columnstore/CMakeLists.txt
View file

@ -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)

2
storage/columnstore/columnstore

@ -1 +1 @@
Subproject commit 410cf29ff2b345a874d38f473e4d646896080661
Subproject commit 31df46168d2eb51e524a7f24386f557a809b78d6