diff options
Diffstat (limited to 'other')
-rw-r--r-- | other/bootstrap_daemon/docker/Dockerfile | 1 | ||||
-rw-r--r-- | other/bootstrap_daemon/docker/Dockerfile.alpine | 1 | ||||
-rw-r--r-- | other/docker/windows/Dockerfile | 1 | ||||
-rw-r--r-- | other/docker/windows/build_dependencies.sh | 12 | ||||
-rw-r--r-- | other/docker/windows/build_toxcore.sh | 4 | ||||
-rwxr-xr-x | other/travis/freebsd-install-stage1 | 1 | ||||
-rwxr-xr-x | other/travis/toxcore-osx-install | 2 |
7 files changed, 3 insertions, 19 deletions
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="\ | |||
8 | autotools-dev \ | 8 | autotools-dev \ |
9 | automake \ | 9 | automake \ |
10 | checkinstall \ | 10 | checkinstall \ |
11 | check \ | ||
12 | git \ | 11 | git \ |
13 | yasm \ | 12 | yasm \ |
14 | libsodium-dev \ | 13 | 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 && \ | |||
20 | apk --no-cache add --virtual build-dependencies \ | 20 | apk --no-cache add --virtual build-dependencies \ |
21 | autoconf \ | 21 | autoconf \ |
22 | automake \ | 22 | automake \ |
23 | check-dev \ | ||
24 | curl \ | 23 | curl \ |
25 | build-base \ | 24 | build-base \ |
26 | libtool \ | 25 | 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 | |||
4 | ARG VERSION_SODIUM=1.0.16 | 4 | ARG VERSION_SODIUM=1.0.16 |
5 | ARG VERSION_OPUS=v1.2.1 | 5 | ARG VERSION_OPUS=v1.2.1 |
6 | ARG VERSION_VPX=v1.6.1 | 6 | ARG VERSION_VPX=v1.6.1 |
7 | ARG VERSION_CHECK=0.12.0 | ||
8 | 7 | ||
9 | ARG SUPPORT_TEST=false | 8 | ARG SUPPORT_TEST=false |
10 | ARG SUPPORT_ARCH_i686=true | 9 | 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() | |||
59 | make install | 59 | make install |
60 | cd .. | 60 | cd .. |
61 | 61 | ||
62 | if [ "${SUPPORT_TEST}" = "true" ]; then | ||
63 | echo | ||
64 | echo "=== Building Check ${VERSION_CHECK} ${ARCH} ===" | ||
65 | git clone --depth=1 --branch="${VERSION_CHECK}" https://github.com/libcheck/check | ||
66 | cd check | ||
67 | autoreconf --install | ||
68 | ./configure --host="${WINDOWS_TOOLCHAIN}" --prefix="${EXTRA_PREFIX_DIR}" | ||
69 | make | ||
70 | make install | ||
71 | cd .. | ||
72 | fi | ||
73 | |||
74 | rm -rf /tmp/* | 62 | rm -rf /tmp/* |
75 | } | 63 | } |
76 | 64 | ||
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() | |||
17 | # toxcore dependencies that we will copy to the user for static build of toxcore (e.g. vpx, opus, sodium) | 17 | # toxcore dependencies that we will copy to the user for static build of toxcore (e.g. vpx, opus, sodium) |
18 | DEP_PREFIX_DIR="/root/prefix/${ARCH}" | 18 | DEP_PREFIX_DIR="/root/prefix/${ARCH}" |
19 | 19 | ||
20 | # toxcore dependencies that user doesn't need in build result (e.g. libcheck used for testing toxcore) | 20 | # toxcore dependencies that user doesn't need in build result |
21 | EXTRA_DEP_PREFIX_DIR="/root/extra-prefix/${ARCH}" | 21 | EXTRA_DEP_PREFIX_DIR="/root/extra-prefix/${ARCH}" |
22 | mkdir -p "${EXTRA_DEP_PREFIX_DIR}" | 22 | mkdir -p "${EXTRA_DEP_PREFIX_DIR}" |
23 | 23 | ||
@@ -73,7 +73,7 @@ build() | |||
73 | 73 | ||
74 | winecfg | 74 | winecfg |
75 | export CTEST_OUTPUT_ON_FAILURE=1 | 75 | export CTEST_OUTPUT_ON_FAILURE=1 |
76 | # add libgcc_s_sjlj-1.dll libwinpthread-1.dll libcheck-0.dll into PATH env var of wine | 76 | # add libgcc_s_sjlj-1.dll libwinpthread-1.dll into PATH env var of wine |
77 | 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` | 77 | 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` |
78 | 78 | ||
79 | if [ "${ALLOW_TEST_FAILURE}" = "true" ]; then | 79 | 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 ] || [ " | |||
110 | gmake \ | 110 | gmake \ |
111 | cmake \ | 111 | cmake \ |
112 | pkgconf \ | 112 | pkgconf \ |
113 | check \ | ||
114 | opencv \ | 113 | opencv \ |
115 | portaudio \ | 114 | portaudio \ |
116 | libsndfile \ | 115 | 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 @@ | |||
3 | # Workaround for bug in Homebrew where it only finds an old Ruby version. | 3 | # Workaround for bug in Homebrew where it only finds an old Ruby version. |
4 | brew update | 4 | brew update |
5 | 5 | ||
6 | brew install libsodium libvpx opus libconfig check astyle | 6 | brew install libsodium libvpx opus libconfig astyle |