diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-01 14:50:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-01 23:02:37 +0200 |
| commit | 12e8ef4505d07adf9f115670f07d12b85f4fd5a2 (patch) | |
| tree | c209707a9439dc25f83a0e6dd1b1b961df29a6b1 /distro-configs | |
| parent | 22267b7797340d1eb52ced10fe05afeb8a42fc2b (diff) | |
Use --with-sytem-cairo for the ASan+UBSan tinderbox again
After 1ae450504cf57457f9702684b1517fda1dd3c481 "drop gtk2 support" removed the
implicit --enable-gtk which removed the implicit --with-system-cairo,
<https://ci.libreoffice.org/job/lo_ubsan/1402/> started to fail with
> [build LNK] Executable/canvasdemo
[...]
> /home/tdf/lode/jenkins/workspace/lo_ubsan/instdir/program/libcairo.so.2: undefined reference to `__muloti4'
[...]
> clang-9: error: linker command failed with exit code 1 (use -v to see invocation)
> /home/tdf/lode/jenkins/workspace/lo_ubsan/solenv/gbuild/LinkTarget.mk:635: recipe for target '/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/LinkTarget/Executable/canvasdemo' failed
etc. Instead of trying to fix that, just explicitly build --with-system-cairo
again. (Another approach could be to --enable-gtk3, which implicitly sets
--with-system-cairo, too.)
Change-Id: I335b2a694b85a15efae6002d890ce0d67811b2bb
Reviewed-on: https://gerrit.libreoffice.org/79962
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/Jenkins/Linux_ubsan_master.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf index 02c630a137a3..da751f0a6cc5 100644 --- a/distro-configs/Jenkins/Linux_ubsan_master.conf +++ b/distro-configs/Jenkins/Linux_ubsan_master.conf @@ -23,5 +23,6 @@ --without-system-libpng --without-system-libxml --without-system-zlib +--with-system-cairo --disable-compiler-plugins --disable-gtk3 |