From c4d08a69369347e53f181319d272bdccfb5c2b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 15 Mar 2017 10:09:53 +0200 Subject: [PATCH] Update build dependencies and documentation The libaio is not required by MaxScale so the check for it is no longer needed. Updated documentation to match the current requirements to build MaxScale. --- .../Building-MaxScale-from-Source-Code.md | 26 ++++++++++--------- cmake/CheckPlatform.cmake | 5 ---- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md b/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md index d2a3f9db1..0cc962ee9 100644 --- a/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md +++ b/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md @@ -5,7 +5,7 @@ requirements are as follows: * CMake version 2.8 or later (Packaging requires version 2.8.12 or later) * GCC version 4.4.7 or later -* libaio +* SQLite3 version 3.3 or later * libcurl * OpenSSL * Bison 2.7 or later @@ -20,33 +20,35 @@ The following packages are required on CentOS/RHEL 7. Older releases may require other packages in addition to these. ``` -git gcc gcc-c++ ncurses-devel bison flex glibc-devel cmake libgcc perl make libtool \ -openssl-devel libaio libaio-devel libcurl-devel pcre-devel tcl tcl-devel systemtap-sdt-devel libuuid libuuid-devel +git gcc gcc-c++ ncurses-devel bison flex glibc-devel cmake libgcc perl make \ +libtool openssl openssl-devel libcurl-devel pcre-devel tcl tcl-devel \ +systemtap-sdt-devel libuuid libuuid-devel sqlite sqlite-devel ``` You can install the packages with the following commands. ``` -sudo yum install git gcc gcc-c++ ncurses-devel bison flex glibc-devel cmake libgcc perl \ - make libtool openssl-devel libaio libaio-devel librabbitmq-devel \ - libcurl-devel pcre-devel tcl tcl-devel systemtap-sdt-devel libuuid libuuid-devel +sudo yum install git gcc gcc-c++ ncurses-devel bison flex glibc-devel cmake \ + libgcc perl make libtool openssl openssl-devel libcurl-devel pcre-devel \ + tcl tcl-devel systemtap-sdt-devel libuuid libuuid-devel sqlite3 sqlite3-devel ``` ### Required packages on Ubuntu and Debian systems -The following packages are required on Ubuntu 14.04. Different releases may require -other packages in addition to these. +The following packages are required on Ubuntu 16.04. Different releases may +require other packages in addition to these. ``` -git build-essential libssl-dev libaio-dev ncurses-dev bison flex \ -cmake perl libtool libcurl4-openssl-dev libpcre3-dev tlc tcl-dev uuid uuid-dev +git build-essential libssl-dev ncurses-dev bison flex cmake perl libtool \ +libcurl4-openssl-dev libpcre3-dev tlc tcl-dev uuid uuid-dev sqlite3-dev ``` You can install the packages with the following command. ``` -sudo apt-get install git build-essential libssl-dev libaio-dev ncurses-dev \ -bison flex cmake perl libtool libcurl4-openssl-dev libpcre3-dev tcl tcl-dev uuid uuid-dev +sudo apt-get install git build-essential libssl-dev ncurses-dev bison flex \ + cmake perl libtool libcurl4-openssl-dev libpcre3-dev tcl tcl-dev uuid \ + uuid-dev libsqlite3-dev ``` ## Preparing the MariaDB MaxScale build diff --git a/cmake/CheckPlatform.cmake b/cmake/CheckPlatform.cmake index b5758be16..3cddc8d05 100644 --- a/cmake/CheckPlatform.cmake +++ b/cmake/CheckPlatform.cmake @@ -44,11 +44,6 @@ check_include_files(time.h HAVE_TIME) check_include_files(unistd.h HAVE_UNISTD) # Check for libraries MaxScale depends on -find_library(HAVE_LIBAIO NAMES aio) -if(NOT HAVE_LIBAIO) - message(FATAL_ERROR "Could not find libaio") -endif() - find_library(HAVE_LIBSSL NAMES ssl) if(NOT HAVE_LIBSSL) message(FATAL_ERROR "Could not find libssl")