diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-11 17:49:27 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-02-11 22:11:31 +0100 |
| commit | e53ea908b7c791fdcd424cf7b0c8716d3b7b54a0 (patch) | |
| tree | 529ac9b5e9603f8da77a1398e43d57deb002daca | |
| parent | c3e098483f4db12e9502c6cbc056e3d7498b7b6c (diff) | |
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.grandin@collabora.co.uk>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Jenkins
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
1 files changed, 0 insertions, 1 deletions
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 \ |