From 6b7dbc57ee098f38e9049686641bb385c70f7892 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Mon, 2 Mar 2020 20:00:38 +0100 Subject: [PATCH] Updated some revs --- TeaSpeak | 2 +- setup_amd64.md | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TeaSpeak b/TeaSpeak index 5a740e1..96bb7ff 160000 --- a/TeaSpeak +++ b/TeaSpeak @@ -1 +1 @@ -Subproject commit 5a740e1853417c12f1ded473e6fada6df9734903 +Subproject commit 96bb7ff56f1ad9247e6c2cd0d14d86cc4ce59b14 diff --git a/setup_amd64.md b/setup_amd64.md index 59a3161..d32034b 100644 --- a/setup_amd64.md +++ b/setup_amd64.md @@ -77,13 +77,15 @@ make -j`nproc --all` && \ make install ``` -## MySQL (libmaria.so) +## MySQL ```shell script +export openssl_path="$(realpath ~/openssl-prebuild/linux_amd64)" && \ apt-get install -y libncurses5-dev && \ git clone https://github.com/mysql/mysql-server.git && cd mysql-server \ mkdir build_ && cd build_ && \ -cmake .. -DBUILD_CONFIG=mysql_release -DWITH_ZLIB=bundled -DDOWNLOAD_BOOST=1 -DWITH_BOOST=`pwd`/boost-library/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-lrt" -DCMAKE_INSTALL_PREFIX=`pwd`/../out/ && -make mysqlclient -j 32 +cmake .. -DBUILD_CONFIG=mysql_release -DWITH_ZLIB=bundled -DDOWNLOAD_BOOST=1 -DWITH_BOOST=`pwd`/boost-library/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-lrt" -DWITH_SSL="$openssl_path" -DCMAKE_INSTALL_PREFIX=`pwd`/../out/ && +make -j 32 # This will fail, but the client will be builded +cmake --install . # This will fail, but the client should work ``` You may have to do this before (on error `unsupported reloc 42 against global symbol`): https://bugs.mysql.com/bug.php?id=89391