diff --git a/.gitignore b/.gitignore index 80d0a96..99f9379 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ WebClient.zip Web-Client-I18N .idea symbols +downloads diff --git a/build_nice.md b/build_nice.md index 48f43f6..1aeba1e 100644 --- a/build_nice.md +++ b/build_nice.md @@ -143,7 +143,7 @@ cd .. Publishing libnice ```shell script [[ -z "${build_os_type}" ]] && export build_os_type=linux -[[ -z "${build_os_type}" ]] && export build_os_arch=amd64 +[[ -z "${build_os_arch}" ]] && export build_os_arch=amd64 export prebuild_path="`pwd`/libnice-prebuild/${build_os_type}_${build_os_arch}/" [[ ! -d libnice-prebuild ]] && git clone https://git.did.science/WolverinDEV/libnice-prebuild.git diff --git a/downloads b/downloads deleted file mode 120000 index 53552e7..0000000 --- a/downloads +++ /dev/null @@ -1 +0,0 @@ -/mnt/d/Users/WolverinDEV/Downloads/ \ No newline at end of file diff --git a/libraries/DataPipes b/libraries/DataPipes index 1cecac6..2c1dbc0 160000 --- a/libraries/DataPipes +++ b/libraries/DataPipes @@ -1 +1 @@ -Subproject commit 1cecac62d02584ed634d79546195718fdcf1a56a +Subproject commit 2c1dbc03447cedd240a3bd6e94dcb87ae91807ff diff --git a/libraries/tomcrypt b/libraries/tomcrypt index aa9d3c3..0ff2920 160000 --- a/libraries/tomcrypt +++ b/libraries/tomcrypt @@ -1 +1 @@ -Subproject commit aa9d3c3590bc7422c8afdafcc906cd2bc60228a4 +Subproject commit 0ff2920957a1687dd3804275fd3f29f41bfd7dd1 diff --git a/setup_amd64.md b/setup_amd64.md index d32034b..50da485 100644 --- a/setup_amd64.md +++ b/setup_amd64.md @@ -1,7 +1,6 @@ # Introduction This instruction set works with `ubuntu:14.04`. - # Setting up build tools ## General required tools ```shell script diff --git a/setup_arm b/setup_arm index 75f7f48..22bf14c 100644 --- a/setup_arm +++ b/setup_arm @@ -1,15 +1,19 @@ +# Docker setup +docker run --rm --privileged multiarch/qemu-user-static:register +docker run -it --name build_arm32v7 arm32v7/ubuntu:14.04 /bin/bash + sudo apt-get update && \ sudo apt-get install build-essential software-properties-common -y && \ sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && \ sudo apt-get update && \ sudo apt-get install gcc-9 g++-9 -y && \ sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9 && \ -sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-9 60 --slave /usr/bin/c++ c++ /usr/bin/c++-9 # THis fails for some reason +sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-9 60 --slave /usr/bin/c++ c++ /usr/bin/c++-9 # This fails for some reason -Sometimes its required to build from source: +# Sometimes its required to build from source: (Not required for ubuntu 14.04) https://raw.githubusercontent.com/darrenjs/howto/master/build_scripts/build_gcc_9.sh -apt-get install -y autoconf git wget libssl-dev realpath libsqlite3-dev libmysqlclient-dev +apt-get install -y autoconf git wget libssl-dev realpath libsqlite3-dev libmysqlclient-dev libpcre3-dev wget https://github.com/Kitware/CMake/releases/download/v3.16.3/cmake-3.16.3.tar.gz && tar xvf cmake-3.16.3.tar.gz && \ cd cmake-3.16.3 && ./configure --parallel=16 && \ @@ -31,11 +35,14 @@ git submodule update --init --recursive ./libraries/build.sh +# External prebuild libraries +# ------------ OpenSSL ------------- +git clone https://github.com/openssl/openssl.git && cd openssl && \ +git checkout OpenSSL_1_1_1-stable && \ +mkdir build && cd build && \ +../config --prefix=`pwd`/../out && \ +make -j30 && \ +make install - -# -------- Troubleshooting ---------- -If go raises an error/crashes install a newer version: -$ sudo add-apt-repository ppa:gophers/archive -$ sudo apt-get update -$ sudo apt-get install golang-1.11-go -sudo update-alternatives --install /usr/bin/go go /usr/lib/go-1.11/bin/go 1 +# Build MySQL +cmake ../ -DOPENSSL_ROOT_DIR=../../server/libraries/openssl-prebuild/linux_arm32v7/ -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/tmp/boost/ -DCMAKE_INSTALL_PREFIX=../out \ No newline at end of file