From c9f560595781a3d68180da66380bdbe0ef785ed1 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Thu, 9 Aug 2018 12:38:44 +0200 Subject: [PATCH] updates --- build_teaspeak.sh | 14 ++++++++++++++ libraries/build_boringssl.sh | 4 ++-- libraries/build_breakpad.sh | 2 +- libraries/build_cxxterminal.sh | 4 ++-- libraries/build_datapipes.sh | 4 ++-- libraries/build_ed25519.sh | 4 ++-- libraries/build_event.sh | 4 ++-- libraries/build_jsoncpp.sh | 4 ++-- libraries/build_mysqlconnector.sh | 4 ++-- libraries/build_opus.sh | 2 +- libraries/build_protobuf.sh | 2 +- libraries/build_spdlog.sh | 4 ++-- libraries/build_stringvariable.sh | 4 ++-- libraries/build_threadpool.sh | 4 ++-- libraries/build_tom.sh | 4 ++-- libraries/build_yaml.sh | 4 ++-- 16 files changed, 41 insertions(+), 27 deletions(-) diff --git a/build_teaspeak.sh b/build_teaspeak.sh index be992d8..13f9dc2 100755 --- a/build_teaspeak.sh +++ b/build_teaspeak.sh @@ -8,3 +8,17 @@ cmake .. -DCMAKE_CXX_FLAGS="-I/usr/local/mysql/connector-c++-8.0/include/jdbc/ - cmake --build `pwd` --target ProviderFFMpeg -- -j 12 cmake --build `pwd` --target ProviderYT -- -j 12 cmake --build `pwd` --target TeaSpeakServer -- -j 12 + +${CXX_FLAGS} +${C_FLAGS} + +#CMake specific +${CMAKE_OPTIONS} +${CMAKE_MAKE_OPTIONS} + +#Make specific (without cmake) +${MAKE_OPTIONS} + + +CXXFLAGS="${CXX_FLAGS}" CFLAGS="${C_FLAGS}" +CXXFLAGS="${CXX_FLAGS}" CFLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} diff --git a/libraries/build_boringssl.sh b/libraries/build_boringssl.sh index c16a897..f703a9f 100755 --- a/libraries/build_boringssl.sh +++ b/libraries/build_boringssl.sh @@ -13,6 +13,6 @@ if [ $? -ne 0 ]; then fi cd build sudo apt-get install golang-go -cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" -make -j 12 +cmake .. -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 diff --git a/libraries/build_breakpad.sh b/libraries/build_breakpad.sh index 3ab3b11..03164eb 100755 --- a/libraries/build_breakpad.sh +++ b/libraries/build_breakpad.sh @@ -2,5 +2,5 @@ cd breakpad/ git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss cd build ../configure -make CXXFLAGS="-std=c++11 -I../../boringssl/include/" +make CXXFLAGS="-std=c++11 -I../../boringssl/include/ ${CXX_FLAGS}" CFLAGS="${C_FLAGS}" ${MAKE_OPTIONS} sudo make install diff --git a/libraries/build_cxxterminal.sh b/libraries/build_cxxterminal.sh index afd1fc5..4301e57 100755 --- a/libraries/build_cxxterminal.sh +++ b/libraries/build_cxxterminal.sh @@ -1,6 +1,6 @@ cd CXXTerminal/libraries/ ./build_event.sh #TODO test status! cd ../build/ -cmake .. -make -j 12 +cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_datapipes.sh b/libraries/build_datapipes.sh index 715a3f4..f6e2553 100755 --- a/libraries/build_datapipes.sh +++ b/libraries/build_datapipes.sh @@ -2,6 +2,6 @@ cd DataPipes/ sudo apt-get install libnice-dev ./build_usrsctp.sh cd build -cmake .. -DCMAKE_CXX_FLAGS="-I../../boringssl/include/ -DUSE_BORINGSSL -static-libgcc -static-libstdc++" -DBUILD_TESTS=OFF -make -j 12 +cmake .. -DCMAKE_CXX_FLAGS="-I../../boringssl/include/ -DUSE_BORINGSSL -static-libgcc -static-libstdc++ ${CXX_FLAGS}" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_ed25519.sh b/libraries/build_ed25519.sh index 3480dda..3e787b7 100755 --- a/libraries/build_ed25519.sh +++ b/libraries/build_ed25519.sh @@ -1,4 +1,4 @@ cd ed25519/build/ -cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/" -make -j 12 +cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_event.sh b/libraries/build_event.sh index 5cd45a9..55fe3d2 100755 --- a/libraries/build_event.sh +++ b/libraries/build_event.sh @@ -1,4 +1,4 @@ cd event/build/ -cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -make -j 12 +cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ ${C_FLAGS}" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_jsoncpp.sh b/libraries/build_jsoncpp.sh index f8ceb8b..c29dd67 100755 --- a/libraries/build_jsoncpp.sh +++ b/libraries/build_jsoncpp.sh @@ -1,4 +1,4 @@ cd jsoncpp/build -cmake .. -make -j 12 CXX_FLAGS="-std=c++11 -fPIC" +cmake .. -DCMAKE_CXX_FLAGS="-std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_mysqlconnector.sh b/libraries/build_mysqlconnector.sh index 8f0dc41..20ddd68 100755 --- a/libraries/build_mysqlconnector.sh +++ b/libraries/build_mysqlconnector.sh @@ -11,6 +11,6 @@ if ! [ "${HEADER:0:34}" == "#if !defined(SSL_ERROR_WANT_ASYNC)" ]; then `cat cdk/foundation/connection_openssl.cc`" > cdk/foundation/connection_openssl.cc fi cd build -cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/" -DWITH_JDBC=ON -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" -make -j 12 +cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/ ${CXX_FLAGS}" -DWITH_JDBC=ON -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_opus.sh b/libraries/build_opus.sh index 8d79753..c3dabd6 100755 --- a/libraries/build_opus.sh +++ b/libraries/build_opus.sh @@ -2,5 +2,5 @@ cd opus ./autogen.sh cd build ../configure -make +make -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${MAKE_OPTIONS} sudo make install diff --git a/libraries/build_protobuf.sh b/libraries/build_protobuf.sh index c8978e0..39dfd7a 100755 --- a/libraries/build_protobuf.sh +++ b/libraries/build_protobuf.sh @@ -6,7 +6,7 @@ fi ./autogen.sh cd build ../configure -make +make -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${MAKE_OPTIONS} #make check sudo make install sudo ldconfig diff --git a/libraries/build_spdlog.sh b/libraries/build_spdlog.sh index 50fbb69..d06387a 100755 --- a/libraries/build_spdlog.sh +++ b/libraries/build_spdlog.sh @@ -1,4 +1,4 @@ cd spdlog/build/ -cmake .. -make -j 12 +cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_stringvariable.sh b/libraries/build_stringvariable.sh index 0ac39dd..479717b 100755 --- a/libraries/build_stringvariable.sh +++ b/libraries/build_stringvariable.sh @@ -1,4 +1,4 @@ cd StringVariable/build/ -cmake .. -make -j 12 +cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_threadpool.sh b/libraries/build_threadpool.sh index 33efd20..5a0dd89 100755 --- a/libraries/build_threadpool.sh +++ b/libraries/build_threadpool.sh @@ -1,4 +1,4 @@ cd Thread-Pool/build/ -cmake .. -make -j 12 +cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_tom.sh b/libraries/build_tom.sh index ed86124..1d6591a 100755 --- a/libraries/build_tom.sh +++ b/libraries/build_tom.sh @@ -1,6 +1,6 @@ cd tommath/build -cmake .. -make -j 12 +cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install cd ../../tomcrypt/ chmod +x create_build.sh && ./create_build.sh diff --git a/libraries/build_yaml.sh b/libraries/build_yaml.sh index d18b0b5..d906cd1 100755 --- a/libraries/build_yaml.sh +++ b/libraries/build_yaml.sh @@ -1,4 +1,4 @@ cd yaml-cpp/build/ -cmake .. -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -make -j 12 CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -std=c++11 -fPIC" +cmake .. -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +make ${CMAKE_MAKE_OPTIONS} sudo make install