Merge branch 'master' of http://git.mcgalaxy.de:8090/WolverinDEV/TeaSpeak-Parent
This commit is contained in:
commit
6a61139ac6
2
TeaSpeak
2
TeaSpeak
@ -1 +1 @@
|
||||
Subproject commit b8d071276ac0be01ff93f30a347c1f5371f04d78
|
||||
Subproject commit 756dbb300a8de12440eb0b7394dde62056303fc4
|
@ -1 +1 @@
|
||||
Subproject commit 43c97648631c22d2ac9439944c7214175eda7605
|
||||
Subproject commit f8b8024caacbef279cd8951a14afe8fd464cc32a
|
@ -1 +1 @@
|
||||
Subproject commit e7b78770eca9724a7af2f344588693dcf8b327df
|
||||
Subproject commit e3ffaae0a31eded54fafed141bafd74222aa31aa
|
@ -1 +1 @@
|
||||
Subproject commit 948ce04ed74397331c158c13209fd2370c2dbd5a
|
||||
Subproject commit 7b98edabb61c6f06199fc22ffc9ebff580dfefc3
|
@ -1,4 +1,17 @@
|
||||
cd boringssl/build/
|
||||
cd boringssl/
|
||||
if [ ! -d lib ]; then
|
||||
mkdir lib && cd lib
|
||||
ln -s ../build/ssl/libssl.so .
|
||||
ln -s ../build/crypto/libcrypto.so .
|
||||
cd ..
|
||||
fi
|
||||
cat /include/openssl/opensslv.h | grep "OPENSSL_VERSION_NUMBER" &> /dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "#if false
|
||||
# define OPENSSL_VERSION_NUMBER 0x1010008fL
|
||||
#endif" > include/openssl/opensslv.h
|
||||
fi
|
||||
cd build
|
||||
sudo apt-get install golang-go
|
||||
cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release"
|
||||
make -j 12
|
||||
|
@ -1,4 +1,16 @@
|
||||
cd mysqlconnector/build
|
||||
cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/"-DWITH_JDBC=ON
|
||||
cd mysqlconnector
|
||||
HEADER=$(cat cdk/foundation/connection_openssl.cc)
|
||||
if ! [ "${HEADER:0:34}" == "#if !defined(SSL_ERROR_WANT_ASYNC)" ]; then
|
||||
echo "Creating new one!"
|
||||
echo "#if !defined(SSL_ERROR_WANT_ASYNC)
|
||||
#define SSL_ERROR_WANT_ASYNC 0xFFEEDDCC
|
||||
#endif
|
||||
#if !defined(SSL_ERROR_WANT_ASYNC_JOB)
|
||||
#define SSL_ERROR_WANT_ASYNC_JOB 0xFFEECCDD
|
||||
#endif
|
||||
`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
|
||||
sudo make install
|
||||
|
@ -3,6 +3,6 @@ cd protobuf
|
||||
cd build
|
||||
../configure
|
||||
make
|
||||
make check
|
||||
#make check
|
||||
sudo make install
|
||||
sudo ldconfig
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit c3a6fe75e1511a4c7a7a6ef0a5954b1918902933
|
||||
Subproject commit ee12c516cf5766b2c32203dcc20c32b8691a8ebb
|
@ -1 +1 @@
|
||||
Subproject commit 3d62db3ecd5377025a458bca827ab4ca12d5c1f0
|
||||
Subproject commit 9bbc4b1fab8262958c172f2d8e87b486c950a051
|
@ -1 +1 @@
|
||||
Subproject commit 0f7fd3c606c204cf13b39ca35722782d3d05e319
|
||||
Subproject commit 2c202ee7c530b84c6387e0dd71be04ac254a1d17
|
Loading…
Reference in New Issue
Block a user