mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use --with-sytem-cairo for the ASan+UBSan tinderbox again

Browse Source 
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>
This commit is contained in:
Stephan Bergmann 2019-10-01 14:50:31 +02:00
parent 22267b7797
commit 12e8ef4505
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distro-configs/Jenkins/Linux_ubsan_master.conf
View File

@ -23,5 +23,6 @@
--without-system-libpng
--without-system-libxml
--without-system-zlib
--with-system-cairo
--disable-compiler-plugins
--disable-gtk3