From 6cd4fcdec4e6671e63e8c7cba2ab4c6d594b13fd Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Mon, 5 Feb 2018 21:38:58 +0000
Subject: Remove libcheck from the dependencies.

We're not gaining much from this library, and it's a burden, especially
for windows development.
---
 other/bootstrap_daemon/docker/Dockerfile        |  1 -
 other/bootstrap_daemon/docker/Dockerfile.alpine |  1 -
 other/docker/windows/Dockerfile                 |  1 -
 other/docker/windows/build_dependencies.sh      | 12 ------------
 other/docker/windows/build_toxcore.sh           |  4 ++--
 other/travis/freebsd-install-stage1             |  1 -
 other/travis/toxcore-osx-install                |  2 +-
 7 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'other')

diff --git a/other/bootstrap_daemon/docker/Dockerfile b/other/bootstrap_daemon/docker/Dockerfile
index 500321c0..373f61c6 100644
--- a/other/bootstrap_daemon/docker/Dockerfile
+++ b/other/bootstrap_daemon/docker/Dockerfile
@@ -8,7 +8,6 @@ RUN export BUILD_PACKAGES="\
       autotools-dev \
       automake \
       checkinstall \
-      check \
       git \
       yasm \
       libsodium-dev \
diff --git a/other/bootstrap_daemon/docker/Dockerfile.alpine b/other/bootstrap_daemon/docker/Dockerfile.alpine
index f0b99bab..48d9f44d 100644
--- a/other/bootstrap_daemon/docker/Dockerfile.alpine
+++ b/other/bootstrap_daemon/docker/Dockerfile.alpine
@@ -20,7 +20,6 @@ RUN set -x && \
 	apk --no-cache add --virtual build-dependencies \
 	autoconf \
 	automake \
-	check-dev \
 	curl \
 	build-base \
 	libtool \
diff --git a/other/docker/windows/Dockerfile b/other/docker/windows/Dockerfile
index 176c3937..07903239 100644
--- a/other/docker/windows/Dockerfile
+++ b/other/docker/windows/Dockerfile
@@ -4,7 +4,6 @@ FROM debian:stretch-slim
 ARG VERSION_SODIUM=1.0.16
 ARG VERSION_OPUS=v1.2.1
 ARG VERSION_VPX=v1.6.1
-ARG VERSION_CHECK=0.12.0
 
 ARG SUPPORT_TEST=false
 ARG SUPPORT_ARCH_i686=true
diff --git a/other/docker/windows/build_dependencies.sh b/other/docker/windows/build_dependencies.sh
index f3d4b603..43c6c3e1 100644
--- a/other/docker/windows/build_dependencies.sh
+++ b/other/docker/windows/build_dependencies.sh
@@ -59,18 +59,6 @@ build()
     make install
     cd ..
 
-    if [ "${SUPPORT_TEST}" = "true" ]; then
-        echo
-        echo "=== Building Check ${VERSION_CHECK} ${ARCH} ==="
-        git clone --depth=1 --branch="${VERSION_CHECK}" https://github.com/libcheck/check
-        cd check
-        autoreconf --install
-        ./configure --host="${WINDOWS_TOOLCHAIN}" --prefix="${EXTRA_PREFIX_DIR}"
-        make
-        make install
-        cd ..
-    fi
-
     rm -rf /tmp/*
 }
 
diff --git a/other/docker/windows/build_toxcore.sh b/other/docker/windows/build_toxcore.sh
index 0f4c2731..a3830455 100644
--- a/other/docker/windows/build_toxcore.sh
+++ b/other/docker/windows/build_toxcore.sh
@@ -17,7 +17,7 @@ build()
     # toxcore dependencies that we will copy to the user for static build of toxcore (e.g. vpx, opus, sodium)
     DEP_PREFIX_DIR="/root/prefix/${ARCH}"
 
-    # toxcore dependencies that user doesn't need in build result (e.g. libcheck used for testing toxcore)
+    # toxcore dependencies that user doesn't need in build result
     EXTRA_DEP_PREFIX_DIR="/root/extra-prefix/${ARCH}"
     mkdir -p "${EXTRA_DEP_PREFIX_DIR}"
 
@@ -73,7 +73,7 @@ build()
 
         winecfg
         export CTEST_OUTPUT_ON_FAILURE=1
-        # add libgcc_s_sjlj-1.dll libwinpthread-1.dll libcheck-0.dll into PATH env var of wine
+        # add libgcc_s_sjlj-1.dll libwinpthread-1.dll into PATH env var of wine
         export WINEPATH=`cd /usr/lib/gcc/${WINDOWS_TOOLCHAIN}/*posix/ ; winepath -w $(pwd)`\;`winepath -w /usr/${WINDOWS_TOOLCHAIN}/lib/`\;`winepath -w ${EXTRA_DEP_PREFIX_DIR}/bin`
 
         if [ "${ALLOW_TEST_FAILURE}" = "true" ]; then
diff --git a/other/travis/freebsd-install-stage1 b/other/travis/freebsd-install-stage1
index 31544c44..46b40374 100755
--- a/other/travis/freebsd-install-stage1
+++ b/other/travis/freebsd-install-stage1
@@ -110,7 +110,6 @@ if [ ! -f ./$IMAGE_NAME.tgz ] || [ ! -f ./freebsd-install-stage1.sha256 ] || [ "
                                                   gmake \
                                                   cmake \
                                                   pkgconf \
-                                                  check \
                                                   opencv \
                                                   portaudio \
                                                   libsndfile \
diff --git a/other/travis/toxcore-osx-install b/other/travis/toxcore-osx-install
index 1c6daecc..8f13cb5f 100755
--- a/other/travis/toxcore-osx-install
+++ b/other/travis/toxcore-osx-install
@@ -3,4 +3,4 @@
 # Workaround for bug in Homebrew where it only finds an old Ruby version.
 brew update
 
-brew install libsodium libvpx opus libconfig check astyle
+brew install libsodium libvpx opus libconfig astyle
-- 
cgit v1.2.3