Commit df25018c authored by Nirbhay Choubey's avatar Nirbhay Choubey Committed by Sergei Golubchik

MDEV-6264: CentOS missing lsof as dependency for MariaDB-server (10.1)

wsrep.cmake should be included before cpack_rpm.cmake as it defines
WITH_WSREP, required by cpack_rpm.cmake to conditionally include galera
helper tools in server package's requires list.
parent 87c30680
...@@ -144,11 +144,11 @@ ENDIF(NOT CPACK_GENERATOR) ...@@ -144,11 +144,11 @@ ENDIF(NOT CPACK_GENERATOR)
INCLUDE(mysql_version) INCLUDE(mysql_version)
INCLUDE(cpack_source_ignore_files) INCLUDE(cpack_source_ignore_files)
INCLUDE(install_layout) INCLUDE(install_layout)
INCLUDE(wsrep)
INCLUDE(cpack_rpm) INCLUDE(cpack_rpm)
INCLUDE(cpack_deb) INCLUDE(cpack_deb)
# Add macros # Add macros
INCLUDE(wsrep)
INCLUDE(character_sets) INCLUDE(character_sets)
INCLUDE(cpu_info) INCLUDE(cpu_info)
INCLUDE(zlib) INCLUDE(zlib)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment