From 2e019525d329be8926efa6d5b058bca505dd922a Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sat, 17 Nov 2018 17:16:40 +0100 Subject: [PATCH] fixed stuff --- TeaSpeak | 2 +- build_teaspeak.sh | 2 +- libraries/DataPipes | 2 +- libraries/build_boringssl.sh | 2 +- libraries/build_jemalloc.sh | 3 ++- libraries/build_protobuf.sh | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/TeaSpeak b/TeaSpeak index fcac3d4..206a1fd 160000 --- a/TeaSpeak +++ b/TeaSpeak @@ -1 +1 @@ -Subproject commit fcac3d48bb5695613d28b1f545bd13c94a84f948 +Subproject commit 206a1fd8337099f6c51c3f4bb61d8a71f407d2f7 diff --git a/build_teaspeak.sh b/build_teaspeak.sh index 5cc90de..b9def0c 100755 --- a/build_teaspeak.sh +++ b/build_teaspeak.sh @@ -5,7 +5,7 @@ fi mkdir build && cd build echo "Build type: ${TEASPEAK_BUILD_TYPE}" -cmake .. -DCMAKE_BUILD_TYPE="${TEASPEAK_BUILD_TYPE}" -DCMAKE_CXX_FLAGS="-I/usr/local/mysql/connector-c++-8.0/include/jdbc/ -I../../../libraries/boringssl/include/ -D_GLIBCXX_USE_CXX11_ABI=1" -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON +cmake .. -DCMAKE_BUILD_TYPE="${TEASPEAK_BUILD_TYPE}" -DCMAKE_CXX_FLAGS=" ${CXX_FLAGS} -I/usr/local/mysql/connector-c++-8.0/include/jdbc/ -I../../../libraries/boringssl/include/ -D_GLIBCXX_USE_CXX11_ABI=1" -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON if [ $? -ne 0 ]; then echo "Failed to run CMAKE project" exit 1 diff --git a/libraries/DataPipes b/libraries/DataPipes index 2c7a0f6..277bbe1 160000 --- a/libraries/DataPipes +++ b/libraries/DataPipes @@ -1 +1 @@ -Subproject commit 2c7a0f6a6303164b39624baee5980c736e0f92fb +Subproject commit 277bbe14f87399aabe5f67e7bc4cb986e974bb09 diff --git a/libraries/build_boringssl.sh b/libraries/build_boringssl.sh index ca81d0a..74d30ee 100755 --- a/libraries/build_boringssl.sh +++ b/libraries/build_boringssl.sh @@ -15,4 +15,4 @@ cd build sudo apt-get install golang-go cmake .. -DOPENSSL_NO_ASM=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} -#sudo make install +sudo make install diff --git a/libraries/build_jemalloc.sh b/libraries/build_jemalloc.sh index e1c98c1..a8e2575 100755 --- a/libraries/build_jemalloc.sh +++ b/libraries/build_jemalloc.sh @@ -31,6 +31,7 @@ if [ $? -ne 0 ]; then echo "Failed to build jemalloc" exit 1 fi + sudo make install &>/dev/null if [ $? -ne 0 ]; then #Workaround because the install fails exit 0 @@ -39,4 +40,4 @@ fi -make -j 12 LIBS="-pthread -static-libgcc -static-libstdc++" CFLAGS="-fPIC" CXXFLAGS="-fPIC" +#make -j 12 LIBS="-pthread -static-libgcc -static-libstdc++" CFLAGS="-fPIC" CXXFLAGS="-fPIC" diff --git a/libraries/build_protobuf.sh b/libraries/build_protobuf.sh index e1311bc..adaf5e1 100755 --- a/libraries/build_protobuf.sh +++ b/libraries/build_protobuf.sh @@ -4,4 +4,4 @@ cd build cmake ../cmake/ -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_CXX_FLAGS="-std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install -sudo ldconfig +#sudo ldconfig