solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 -
1 file changed, 1 deletion(-)
New commits:
commit e53ea908b7c791fdcd424cf7b0c8716d3b7b54a0
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Feb 11 17:49:27 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 11 22:11:31 2020 +0100
Fix duplicate "stringresource" in MERGE_LIBRARY_LIST
...where both entries were added with
40fe721462df5bedacddc8829cefc3d739cf940f
"add some more libs to libmerged", and defining Library_stringresource in
scripting/Module_scripting.mk is conditional on BUILD_TYPE SCRIPTING.
This will hopefully fix
<https://ci.libreoffice.org/job/lo_callgrind_linux/7884/> (which apparently
uses
--enable-mergelibs),
> /usr/bin/ld:
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o:
in function `stringresource::StringResourceImpl::isReadOnly()':
>
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:297:
multiple definition of `stringresource::StringResourceImpl::isReadOnly()';
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o:/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:297:
first defined here
> /usr/bin/ld:
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o:
in function
`stringresource::StringResourceImpl::loadLocale(stringresource::LocaleItem*)':
>
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:659:
multiple definition of
`stringresource::StringResourceImpl::loadLocale(stringresource::LocaleItem*)';
/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o:/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:659:
first defined here
[...]
Change-Id: Ie667487bced048d3b0b0081a9fa4abafa090f02b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88468
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Jenkins
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index e20cec20344e..03a64792d191 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -49,7 +49,6 @@ MERGE_LIBRARY_LIST := \
sot \
$(if $(DISABLE_GUI),,spl) \
$(call gb_Helper_optional,SCRIPTING,stringresource) \
- stringresource \
svl \
svt \
svx \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
