diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-07-11 15:06:54 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-07-11 15:10:00 +0100 |
| commit | 888037b922eade633b54dd5cbdabf9b958963c24 (patch) | |
| tree | 7d46e8c6472f22b3b296738e3be225447305ebb1 | |
| parent | 74e0ac87ddbf912db331a45e5e096d232837b5a9 (diff) | |
Remove --disable-shared from libXfont as it now can be built shared for Cygwin
| -rw-r--r-- | jhbuildrc | 4 | ||||
| -rw-r--r-- | jhbuildrc.x86_64-pc-cygwin | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -113,9 +113,7 @@ module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' CFLAGS="-Wno-e module_autogenargs['xkeyboard-config'] = autogenargs + ' --with-xkb-rules-symlink=xorg' -# libXfont must be built static due to weak linkage nonsense -module_autogenargs['libXfont'] = autogenargs + ' --disable-shared --disable-fc' - +module_autogenargs['libXfont'] = autogenargs + ' --disable-fc' # build xlib-based libGL #module_autogenargs['mesa-mesa'] = autogenargs + ' --with-gallium-drivers=swrast --disable-dri --enable-osmesa --enable-xlib-glx' diff --git a/jhbuildrc.x86_64-pc-cygwin b/jhbuildrc.x86_64-pc-cygwin index 8d31175..d666cbf 100644 --- a/jhbuildrc.x86_64-pc-cygwin +++ b/jhbuildrc.x86_64-pc-cygwin @@ -109,7 +109,7 @@ module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --with-khronos module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --with-builderstring="Tag: `cd ' + checkoutroot + '/xorg/xserver ; git describe | tr -d \\n`"' module_autogenargs['xkeyboard-config'] = autogenargs + ' --with-xkb-rules-symlink=xorg' -module_autogenargs['libXfont'] = autogenargs + ' --disable-shared --disable-fc' +module_autogenargs['libXfont'] = autogenargs + ' --disable-fc' # want to test xlib based libGL module_autogenargs['libGL'] = autogenargs + ' --with-gallium-drivers=swrast --disable-dri -enable-osmesa --enable-xlib-glx ac_cv_path_LLVM_CONFIG=no' |