fixed build script
This commit is contained in:
Submodule
+1
Submodule Web-Client added at 2b00136e6e
+3
-11
@@ -1,5 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
#The libs have no need to be attach to the master :)
|
||||||
|
cd TeaSpeak
|
||||||
git submodule foreach -q --recursive '
|
git submodule foreach -q --recursive '
|
||||||
echo "Updating $name";
|
echo "Updating $name";
|
||||||
BRANCH=$(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)
|
BRANCH=$(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)
|
||||||
@@ -8,14 +10,4 @@ if [ -z ${BRANCH} ]; then
|
|||||||
fi
|
fi
|
||||||
git checkout ${BRANCH};
|
git checkout ${BRANCH};
|
||||||
echo "git pull origin ${BRANCH}"
|
echo "git pull origin ${BRANCH}"
|
||||||
git pull origin ${BRANCH}'
|
git pull origin ${BRANCH}'
|
||||||
|
|
||||||
git submodule foreach -q --recursive '
|
|
||||||
echo "Updating $name";
|
|
||||||
CHECKOUT=$(git config -f $toplevel/.gitmodules submodule.$name.checkout)
|
|
||||||
if [ ! -z ${CHECKOUT} ]; then
|
|
||||||
git checkout ${CHECKOUT};
|
|
||||||
echo "Checking out ${CHECKOUT} for $name"
|
|
||||||
fi
|
|
||||||
'
|
|
||||||
|
|
||||||
@@ -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
|
`cat cdk/foundation/connection_openssl.cc`" > cdk/foundation/connection_openssl.cc
|
||||||
fi
|
fi
|
||||||
cd build
|
cd build
|
||||||
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}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
|
cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/ ${CXX_FLAGS}" -DWITH_JDBC=OFF -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
|
||||||
make ${CMAKE_MAKE_OPTIONS}
|
make ${CMAKE_MAKE_OPTIONS}
|
||||||
sudo make install
|
sudo make install
|
||||||
|
|||||||
+1
-1
Submodule libraries/mysqlconnector updated: 7abcdc88c8...c836e39f46
Reference in New Issue
Block a user