From 6d0d3098d2252cf5931adf2c1f5e65492d0204b9 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 8 Aug 2018 22:08:56 +0200 Subject: [PATCH] updated jenkins file --- libraries/CXXTerminal | 2 +- libraries/DataPipes | 2 +- libraries/boringssl | 2 +- libraries/breakpad | 2 +- libraries/build.sh | 3 ++- libraries/event | 2 +- libraries/protobuf | 2 +- libs.txt | 4 +--- notes.txt | 4 +++- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libraries/CXXTerminal b/libraries/CXXTerminal index bb9ae47..13d2119 160000 --- a/libraries/CXXTerminal +++ b/libraries/CXXTerminal @@ -1 +1 @@ -Subproject commit bb9ae471a47d455c90b86755e48332a8229c6bb1 +Subproject commit 13d2119a83b517a6f2355dca61314c2ac14df977 diff --git a/libraries/DataPipes b/libraries/DataPipes index f8b8024..43c9764 160000 --- a/libraries/DataPipes +++ b/libraries/DataPipes @@ -1 +1 @@ -Subproject commit f8b8024caacbef279cd8951a14afe8fd464cc32a +Subproject commit 43c97648631c22d2ac9439944c7214175eda7605 diff --git a/libraries/boringssl b/libraries/boringssl index e277939..e7b7877 160000 --- a/libraries/boringssl +++ b/libraries/boringssl @@ -1 +1 @@ -Subproject commit e27793940e275c355eb06134693411e7f35f1a16 +Subproject commit e7b78770eca9724a7af2f344588693dcf8b327df diff --git a/libraries/breakpad b/libraries/breakpad index 7b98eda..948ce04 160000 --- a/libraries/breakpad +++ b/libraries/breakpad @@ -1 +1 @@ -Subproject commit 7b98edabb61c6f06199fc22ffc9ebff580dfefc3 +Subproject commit 948ce04ed74397331c158c13209fd2370c2dbd5a diff --git a/libraries/build.sh b/libraries/build.sh index a004f97..b945cbb 100755 --- a/libraries/build.sh +++ b/libraries/build.sh @@ -1,3 +1,4 @@ +#!/bin/bash mkdir -p \ boringssl/build \ @@ -18,7 +19,7 @@ mkdir -p \ yaml-cpp/build \ protobuf/build -function exec_script() { +function exec_script { echo "Executing ${1}" ./${1} if [ $? -ne 0 ]; then diff --git a/libraries/event b/libraries/event index ee12c51..c3a6fe7 160000 --- a/libraries/event +++ b/libraries/event @@ -1 +1 @@ -Subproject commit ee12c516cf5766b2c32203dcc20c32b8691a8ebb +Subproject commit c3a6fe75e1511a4c7a7a6ef0a5954b1918902933 diff --git a/libraries/protobuf b/libraries/protobuf index 3389bd9..3d62db3 160000 --- a/libraries/protobuf +++ b/libraries/protobuf @@ -1 +1 @@ -Subproject commit 3389bd965b1fb6687056d81b069e99f8c2543cba +Subproject commit 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 diff --git a/libs.txt b/libs.txt index 55f9167..5288cbc 100644 --- a/libs.txt +++ b/libs.txt @@ -1,7 +1,5 @@ -sudo apt-get install libssl-dev -sudo apt-get install libsqlite3-dev -sudo apt-get install libevent-dev sudo apt-get install autotools-dev sudo apt-get install automake sudo apt-get install libtool sudo apt-get install libmysqlclient-dev +sudo apt-get install autogen autotools-dev dh-autoreconf diff --git a/notes.txt b/notes.txt index ca27d6a..f1a4fe3 100644 --- a/notes.txt +++ b/notes.txt @@ -28,9 +28,11 @@ git clone https://chromium.googlesource.com/linux-syscall-support src/third_part make CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -std=c++11" For MySQL: +ATTENTION: Its important to use the latest mysql version (5.7) + You may have to ling <...>_r.a git submodule update --init mkdir build && cd build -cmake .. -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -static-libgcc -static-libstdc++" -DWITH_JDBC=ON +cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++" -DWITH_JDBC=ON make -j 12 For boringssl: