Update jhbuildrc.i686-w64-mingw32 to match jhbuild

1 files changed, 66 insertions, 21 deletions

diff --git a/jhbuildrc.i686-w64-mingw32 b/jhbuildrc.i686-w64-mingw32
index fa6cc16..5cbb0e5 100644
--- a/jhbuildrc.i686-w64-mingw32
+++ b/jhbuildrc.i686-w64-mingw32
@@ -3,52 +3,82 @@
 #
 
 moduleset = '/jhbuild/xorg.modules'
-modules = [ 'xwin', 'xorg' ]
+if 'TINDERBOX' in os.environ:
+        modules = [ 'xwin', 'The X Window System', 'extras', 'tests' ]
+else:
+        modules = [ 'xwin', 'The X Window System' ]
 
 # skip building stuff which isn't appropriate for Windows target
 skip = [ 'applewmproto', 'libAppleWM',
-	 'videoproto', 'xf86dgaproto', 'xf86driproto', 'xf86vidmodeproto', 'dri2proto',
-	 'libXv', 'libXvMC', 'libXxf86dga', 'libXxf86dga', 'libXxf86vm',
-	 'libxkbui', 'libdrm', 'libpciaccess',
-	 'xvinfo', 'xdriinfo', 'xgamma',
-	 'xorg-drivers',
-	 'libGL', 'mesa-demos',
-	 'luit', 'sessreg', 'smproxy', 'xkbevd', 'xinit',
-	 'ico', 'twm', 'transset', 'x11perf', 'xwininfo'
+         'videoproto', 'xf86dgaproto', 'xf86driproto', 'xf86vidmodeproto', 'dri2proto', 'dri3proto',
+         'libXv', 'libXvMC', 'libXxf86dga', 'libXxf86dga', 'libXxf86vm', 'libxshmfence',
+         'libxkbui', 'libevdev', 'libpciaccess',
+         'app-xvinfo', 'app-xdriinfo', 'app-xgamma',
+         'The X Video Drivers', 'The X Input Drivers',
+         'mesa-drm', 'mesa-mesa', 'mesa-demos', 'mesa-glut', 'mesa-glu',
+         'libFS',
+         'app-ico',
+         'app-luit',
+         'app-rendercheck',
+         'app-rstart',
+         'app-sessreg',
+         'app-smproxy',
+         'app-transset',
+         'app-twm',
+         'app-x11perf',
+         'app-xconsole',
+         'app-xdm',
+         'app-xfs',
+         'app-xfsinfo',
+         'app-xinit',
+         'app-xkbevd',
+         'app-xman',
+         'app-xsm',
+         'app-xvidtune',
+         'app-xvinfo',
+         'app-xwininfo',
        ]
-# libGL is not easily cross-compilable
+# libGL was not easily cross-compilable, can probably be removed from this list now
 # some modules don't make much sense to build for mingw64
 # some modules are provided with xming, so can be ported with some work...
 
 build_policy = 'updated-deps'
+if 'TINDERBOX' in os.environ:
+        nopoison = True
+        quiet_mode = True
 
-os.environ['BUILD'] = 'i686-pc-cygwin'
+#
+os.environ['BUILD'] = 'x86_64-pc-cygwin'
 os.environ['HOST'] = 'i686-w64-mingw32'
 
-# source checkout, build and install directories
+# All source modules will be here after the checkout
 checkoutroot = '/jhbuild/checkout'
+
+# All build takes place here
 buildroot = os.path.join('/jhbuild', os.environ['HOST'], 'build')
+
+# All installed stuff will be here
 prefix = os.path.join('/jhbuild', os.environ['HOST'], 'install')
 
 os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share', 'aclocal')
 os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') + ':' + os.path.join(prefix, 'share', 'pkgconfig')
 # do not search in the host pkgconfig libdir
 os.environ['PKG_CONFIG_LIBDIR'] = '/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig'
-
+#os.environ['PKG_CONFIG_DEBUG_SPEW'] = '1'
 os.environ['CC'] = 'ccache i686-w64-mingw32-gcc'
 os.environ['CXX'] = 'ccache i686-w64-mingw32-g++'
 os.environ['CC_FOR_BUILD'] = 'ccache gcc'
-
 os.environ['INSTALL'] = '/usr/local/bin/install-check'
-
 os.environ['CFLAGS'] = '-g -O0 -fdiagnostics-show-option'
+os.environ['CXXFLAGS'] = '-g -O0 -fdiagnostics-show-option'
+os.environ['AUTOMAKE'] = 'automake --force-missing --copy'
+#os.environ['V'] = '1'
+
+# env vars to help some tests find things...
 os.environ['JHBUILD_CHECKOUTROOT'] = checkoutroot
 os.environ['JHBUILD_BUILDROOT'] = buildroot
 os.environ['JHBUILD_PREFIX'] = prefix
 
-#os.environ['V'] = '1'
-#os.environ['PKG_CONFIG_DEBUG_SPEW'] = '1'
-
 autogenargs = '--cache-file=' + os.path.join('/jhbuild', os.environ['HOST'], 'configure-cache')
 autogenargs += ' --build='+os.environ['BUILD']
 autogenargs += ' --host='+os.environ['HOST']
@@ -60,12 +90,27 @@ autogenargs += ' --host='+os.environ['HOST']
 
 module_autogenargs['xserver'] = autogenargs + ' -disable-glx'
 module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --with-builderstring="Tag: `cd ' + checkoutroot + '/xorg/xserver ; git describe | tr -d \\n`"'
+module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' CFLAGS="-Wno-error=implicit-function-declaration ' + os.environ['CFLAGS'] + '"'
 
 module_autogenargs['xkeyboard-config'] = autogenargs + ' --with-xkb-rules-symlink=xorg'
-module_autogenargs['fontconfig'] = autogenargs + ' --enable-libxml2 --with-arch=le32d8'
+module_autogenargs['fontconfig'] = autogenargs + ' --enable-libxml2'
 
-os.environ['LIBS'] = '-lws2_32'
+# must put pthread into LIBS when building pthread-stubs, as weak cleverness won't work...
+os.environ['LIBS'] = '-lpthread'
+
+# do not start xvfb for any testmodules
+noxvfb = 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'
-
+# AC_CHECK_FUNC can't find strncasecmp() because of stdcall linkage
+os.environ['ac_cv_func_strncasecmp'] = 'yes'
+# --enable-malloc0returnsnull
+os.environ['xorg_cv_malloc0_returns_null'] = 'yes'
+# AC_CHECK_FUNC finds unprototyped getpagesize in libgcc.a
+os.environ['ac_cv_func_getpagesize'] = 'no'
+# AC_CHECK_FUNC finds unprototyped usleep
+os.environ['ac_cv_func_usleep'] = 'no'