[checkmk-commits] Disable pthreads support for MinGW cross-compilation.

Module: check_mk Branch: master Commit: e30fbd3e6f7e35cccdfdf82fe3c2b77742e7891e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e30fbd3e6f7e35… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 30 17:11:28 2018 +0200 Disable pthreads support for MinGW cross-compilation. Change-Id: Ic9f2f65fd1df931be7663f830aa0ff181a76021e --- agents/windows/build.sh | 2 ++ agents/windows/chroot_version | 2 +- agents/windows/test/build-googletest | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/windows/build.sh b/agents/windows/build.sh index 45136f0..14f33a2 100644 --- a/agents/windows/build.sh +++ b/agents/windows/build.sh @@ -55,6 +55,7 @@ function build { # during install step # --build : architecture of build machine (for cross-compilation) # --host : target architecture of cross-compilation + # --without-pthreads : MinGW's pthread implementation is not compatible with googletest # CC : C compiler (redundant but quiets a cross-compilation warning) # CXX : C++ compiler # WINDRES : program for manipulating Windows resource files @@ -63,6 +64,7 @@ function build { --program-transform-name=${transforms[$1]} \ --build i686-pc-linux-gnu \ --host ${archs[$1]}${common} \ + --without-pthreads \ CC=${archs[$1]}${common}-gcc-posix \ CXX=${archs[$1]}${common}-g++-posix \ WINDRES=${archs[$1]}${common}-windres \ diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index b1bd38b..8351c19 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -13 +14 diff --git a/agents/windows/test/build-googletest b/agents/windows/test/build-googletest index 84eb4b9..02ec830 100755 --- a/agents/windows/test/build-googletest +++ b/agents/windows/test/build-googletest @@ -1,6 +1,7 @@ #!/bin/bash # Build MinGW libraries for Google Test and Google Mock. +set -x set -e version=0048647619 [[ -z $CHROOT_BUILD_DIR ]] && exit 1