From 753d53a4f60fce54ae1d06988a670bb87ceff75f Mon Sep 17 00:00:00 2001 From: Richard Bachmann <richard.bachmann@cern.ch> Date: Wed, 8 Jan 2020 17:27:05 +0100 Subject: [PATCH 1/2] Attempt at setting basedir with flags --- cmake/environment/mysql.template | 1 + externals/CMakeLists.txt | 2 ++ externals/mysql_postinstall.sh | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 cmake/environment/mysql.template create mode 100644 externals/mysql_postinstall.sh diff --git a/cmake/environment/mysql.template b/cmake/environment/mysql.template new file mode 100644 index 0000000000..3249511368 --- /dev/null +++ b/cmake/environment/mysql.template @@ -0,0 +1 @@ +export MYSQL_HOME=${mysql_home} diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 90578ba483..4ea36f31e8 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -1478,6 +1478,8 @@ LCGPackage_Add( IF LCG_COMP MATCHES clang THEN -DPLUGIN_TOKUDB=NO ENDIF + INSTALL_COMMAND ${MAKE} install + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mysql_postinstall.sh <INSTALL_DIR> DEPENDS Boost bison jemalloc libevent zlib libxml2 libedit lz4 zeromq msgpackc ) diff --git a/externals/mysql_postinstall.sh b/externals/mysql_postinstall.sh new file mode 100644 index 0000000000..8eecb0d9ab --- /dev/null +++ b/externals/mysql_postinstall.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +if test "x$1" = "x" ; then + echo "mysql_postinstall: Install directory undefined!" + exit 1 +else + MYSQL_HOME=$1 +fi + +# Create $MYSQL_HOME/my.cnf config file and set basedir as install dir +if !(test -d $MYSQL_HOME); then + echo "mysql_postinstall: Given install directory is not a directory." + exit 1 +fi +if test -f "$MYSQL_HOME/my.cnf"; then + echo "mysql_postinstall: my.cnf already exists, appending new basedir" + echo "basedir = $MYSQL_HOME" >> "$MYSQL_HOME/my.cnf" +else + echo "mysql_postinstall: Creating file $MYSQL_HOME/my.cnf" + echo "basedir = $MYSQL_HOME" > "$MYSQL_HOME/my.cnf" +fi + +exit 0 -- GitLab From 265655252f05cda57598d77b58ad7d4ab311bdde Mon Sep 17 00:00:00 2001 From: Richard Bachmann <richard.bachmann@cern.ch> Date: Fri, 10 Jan 2020 14:20:48 +0100 Subject: [PATCH 2/2] Made postinstall executable again --- externals/mysql_postinstall.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 externals/mysql_postinstall.sh diff --git a/externals/mysql_postinstall.sh b/externals/mysql_postinstall.sh old mode 100644 new mode 100755 -- GitLab