From: Uwe Hermann <redacted>
Date: Thu, 30 Jan 2014 21:20:12 +0000 (+0100)
Subject: sigrok-cross-mingw: Drop -DENABLE_COTIRE=y.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=63a302e7906b163f8cd3f95a159ab3ad75dcee21;p=sigrok-util.git

sigrok-cross-mingw: Drop -DENABLE_COTIRE=y.

This seems to cause issues on some Ubuntu versions (likely due to an
older cmake version, but we didn't investigate much). We're just
dropping the Cotire use in this script to avoid the problems, since it
is a fully optional thing (only affects compile performance) anyway.

This fixes bug #249.
---

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 11660c9..c52ef22 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -164,7 +164,7 @@ cd ..
 git clone git://sigrok.org/pulseview
 cd pulseview
 patch -p1 < ../../pulseview_decodersdir.patch
-PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y -DENABLE_COTIRE=y -DENABLE_TESTS=y .
+PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y -DENABLE_TESTS=y .
 make $PARALLEL VERBOSE=1
 make install
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi