hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add build test deps specific for 2.4

Browse Source
This commit is contained in:
Timofey Turenko
2019-04-24 15:41:15 +03:00
parent 4ad60fa2a2
commit f6c6415c4f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BUILD/install_test_build_deps.sh
View File

@ -21,7 +21,8 @@ then
git wget build-essential \ git wget build-essential \
libssl-dev mariadb-client php perl \ libssl-dev mariadb-client php perl \
coreutils libjansson-dev zlib1g-dev \ coreutils libjansson-dev zlib1g-dev \
mariadb-test python python-pip cmake libpam0g-dev mariadb-test python python-pip cmake \
libpam0g-dev libsqlite3-dev
sudo apt-get install -y --force-yes openjdk-8-jdk sudo apt-get install -y --force-yes openjdk-8-jdk
if [ $? != 0 ] if [ $? != 0 ]
then then
@ -50,7 +51,8 @@ EOL
sudo zypper -n install gcc gcc-c++ \ sudo zypper -n install gcc gcc-c++ \
libopenssl-devel libgcrypt-devel MariaDB-devel MariaDB-test \ libopenssl-devel libgcrypt-devel MariaDB-devel MariaDB-test \
php perl coreutils libjansson-devel python python-pip \ php perl coreutils libjansson-devel python python-pip \
cmake pam-devel openssl-devel python-devel libjansson-devel cmake pam-devel openssl-devel python-devel libjansson-devel \
sqlite3 sqlite3-devel libcurl-devel
sudo zypper -n install java-1_8_0-openjdk sudo zypper -n install java-1_8_0-openjdk
else else
# YUM! # YUM!
@ -68,7 +70,8 @@ EOL
libgcrypt-devel \ libgcrypt-devel \
openssl-devel mariadb-devel mariadb-test \ openssl-devel mariadb-devel mariadb-test \
php perl coreutils python python-pip \ php perl coreutils python python-pip \
cmake pam-devel python-devel jansson-devel cmake pam-devel python-devel jansson-devel \
sqlite sqlite-devel libcurl-devel
sudo yum install -y --nogpgcheck java-1.8.0-openjdk sudo yum install -y --nogpgcheck java-1.8.0-openjdk
sudo yum install -y --nogpgcheck centos-release-scl sudo yum install -y --nogpgcheck centos-release-scl
sudo yum install -y --nogpgcheck devtoolset-7-gcc* sudo yum install -y --nogpgcheck devtoolset-7-gcc*

2
maxscale-system-test/utilities.cmake
View File

@ -122,3 +122,5 @@ find_program(HAVE_PHP php)
if (NOT HAVE_PHP) if (NOT HAVE_PHP)
message(FATAL_ERROR "Could not find php. Add -DHAVE_PHP=Y to CMake invocation ignore this.") message(FATAL_ERROR "Could not find php. Add -DHAVE_PHP=Y to CMake invocation ignore this.")
endif() endif()
find_package(CURL REQUIRED)