diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-11-21 21:18:43 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-03-02 18:34:01 +0000 |
| commit | f4155a33731b036e4598bdbf08cb7babab40a10f (patch) | |
| tree | b6396b8a686e224e9c3dfa275a48014a98ac0293 | |
| parent | 4f388a7b75305e79794a9a77235c9054cea39644 (diff) | |
Cross-compile fixes
Target must be named in jhbuildrc file
Can't run 'make check' when cross-compiling
| -rwxr-xr-x | cronscript | 5 | ||||
| -rw-r--r-- | jhbuildrc.mingw | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -22,7 +22,8 @@ cp --no-dereference /jhbuild/checkout/mesa/glut/lib/*.dll.a /jhbuild/install/lib # jhbuild for mingw, if we have time T2=$(date +%s) DT="$(expr $T2 - $T1)" +echo "cygwin build took $DT seconds" -if [ $DT -lt 7200 ] ; then -jhbuild -f jhbuildrc.mingw --cross-target="crosscompile to MINGW" autobuild -c -a --report-url="http://jturney-allegra:TBK1zMob@tinderbox.freedesktop.org/builds/rpc" +if [ $DT -lt 14400 ] ; then +jhbuild -f jhbuildrc.mingw autobuild -c -a --report-url="http://jturney-allegra:TBK1zMob@tinderbox.freedesktop.org/builds/rpc" fi diff --git a/jhbuildrc.mingw b/jhbuildrc.mingw index 7bc3912..1dbf29c 100644 --- a/jhbuildrc.mingw +++ b/jhbuildrc.mingw @@ -1,6 +1,7 @@ # # jhbuildrc for building for mingw # +cross_target = "cross to MINGW i686" moduleset = '/jhbuild/xorg.modules' modules = [ 'xwin', 'xorg' ] @@ -72,8 +73,8 @@ os.environ['LIBS'] = '-lpthread -lws2_32' # do not start xvfb for any testmodules noxvfb = True -# always run 'make check' -makecheck = True +# can't run 'make check' when cross-compiling +makecheck = False # AC_FUNC_STRNLEN guesses 'yes' when cross-compiling os.environ['ac_cv_func_strnlen_working'] = 'no' |