[Libreoffice-commits] core.git: RepositoryModule_build.mk solenv/gbuild

[Stephan Bergmann]

On 23/12/2021 03:39, Tomaž Vajngerl (via logerrit) wrote:
> commit 9d0460ae7210367c9aee6788378758c59b1b0c42
> Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
> AuthorDate: Thu Dec 23 11:38:24 2021 +0900
> Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
> CommitDate: Thu Dec 23 11:38:24 2021 +0900
> 
>      add drawinglayercore to merged libs
>      
>      Change-Id: I3c2fc7f72fab8eb5deb21c609bd60663ba35e251

This appears to have broken --enable-mergelibs, see 
<https://ci.libreoffice.org/job/lo_callgrind_linux/11887/>,

> [build LNK] Library/libmergedlo.so
> /usr/bin/ld: /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/svx/source/form/typemap.o (symbol from plugin): in function `aSvxColorItem_Impl':
> (.text+0x0): multiple definition of `aSfxInt16Item_Impl'; /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/sfx2/source/appl/appbas.o (symbol from plugin):(.text+0x0): first defined here
> collect2: error: ld returned 1 exit status
> /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/Library_merged.mk:11: recipe for target '/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/instdir/program/libmergedlo.so' failed
> make[1]: *** [/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/instdir/program/libmergedlo.so] Error 1

(And why didn't this go via Gerrit?)