From 77df75de0f4daf2c3d5d7c9ce240ae2109cc1c0c Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Tue, 2 Jul 2019 14:19:47 +0200 Subject: [PATCH] Update datapipes rev --- helper.txt | 12 ++++++++++-- third_party/DataPipes | 2 +- third_party/build_datapipes.sh | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/helper.txt b/helper.txt index 1816615..320876e 100644 --- a/helper.txt +++ b/helper.txt @@ -1,6 +1,6 @@ Update/initialize git submodules (Using the refs given!): #Update the module -git submodule update --init --recursive +git submodule update --init --recursive -f #Resetting local made changes git submodule foreach git reset --hard @@ -26,9 +26,17 @@ echo "deb http://archive.debian.org/debian/ wheezy main contrib non-free" > /etc apt-get update apt-get install aptitude -aptitude install sudo git wget curl python-software-properties realpath +aptitude install sudo wget curl python-software-properties realpath autoconf libz-dev gettext libcurl4-openssl-dev apt-get install golang-go #For boringssl +# Install git 2.X +wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.20.0.tar.gz +tar xvf git-2.20.0.tar.gz +make configure +./configure --prefix=/usr --with-openssl +make -j 12 +sudo make install + # Setup GCC-9 from source aptitude install build-essential wget ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-9.1.0/gcc-9.1.0.tar.gz diff --git a/third_party/DataPipes b/third_party/DataPipes index cd92046..025f955 160000 --- a/third_party/DataPipes +++ b/third_party/DataPipes @@ -1 +1 @@ -Subproject commit cd92046ec1a91fa6b904427afeda840fab4cc338 +Subproject commit 025f955ee50bd057a8f6a3f67c7b6eda7834b4fa diff --git a/third_party/build_datapipes.sh b/third_party/build_datapipes.sh index f134097..68db2bd 100755 --- a/third_party/build_datapipes.sh +++ b/third_party/build_datapipes.sh @@ -25,6 +25,6 @@ check_err_exit ${library_path} "Failed to build srtp!" check_err_exit ${library_path} "Failed to build sdptransform!" cd .. -cmake_build ${library_path} -DCrypto_ROOT_DIR="`pwd`/boringssl/" -DCRYPTO_TYPE="boringssl" -DCMAKE_CXX_FLAGS="-fPIC -static-libgcc -static-libstdc++" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="-fPIC" +cmake_build ${library_path} -DCrypto_ROOT_DIR="`pwd`/boringssl/" -DCRYPTO_TYPE="boringssl" -DCMAKE_CXX_FLAGS="-fPIC -static-libgcc -static-libstdc++" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="-fPIC" -DBUILD_WEBRTC=OFF check_err_exit ${library_path} "Failed to build DataPipes!" set_build_successful ${library_path} \ No newline at end of file