diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-08-13 12:28:14 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-13 20:06:47 +0200 |
| commit | c820cb429fc3d3eec9bf6596f0a34995cbd93982 (patch) | |
| tree | ea74b288385927891b407c1ee8079ed79a1479c4 /include/unotools/streamhelper.hxx | |
| parent | 6f986e881c551ae218b95c162de67433901df85f (diff) | |
Help older linkers (Ubuntu 18.04, Fedora 31)
Fixes a regression from commit 429e6e6efbfbc65d36452cbf8b3a25740a1dc8bc
("osl::Mutex->std::mutex in OInputStreamHelper"), which results in
failed linking with some older toolchains:
/usr/bin/ld.gold: error: workdir/CxxObject/xmlsecurity/source/helper/UriBindingHelper.o:
requires dynamic R_X86_64_PC32 reloc against '_ZThn40_N3utl18OInputStreamHelper7acquireEv'
which may overflow at runtime; recompile with -fPIC
include/com/sun/star/uno/Reference.hxx:240: error: undefined reference to
'non-virtual thunk to utl::OInputStreamHelper::acquire()'
collect2: error: ld returned 1 exit status
xmlsecurity/Library_xmlsecurity.mk:10: recipe for target
'symbols/instdir/program/libxmlsecurity.so' failed
Known problematic setups are my Ubuntu 18.04 build schroot and
Caolán's Fedora 31 VM to run Coverity.
Change-Id: I40f0734a0cb9131193abf21ba95dc63816b5c1d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120426
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/unotools/streamhelper.hxx')
| -rw-r--r-- | include/unotools/streamhelper.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index 26c7aa37c2da..5d0a3792855b 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -57,6 +57,9 @@ public: virtual void SAL_CALL seek( sal_Int64 location ) override; virtual sal_Int64 SAL_CALL getPosition( ) override; virtual sal_Int64 SAL_CALL getLength( ) override; + + // workaround for Ubuntu 18.04 / Fedora 31 (Coverity VM) build with std::mutex; must not be inline! + virtual void SAL_CALL acquire() SAL_NOEXCEPT override; }; } // namespace utl |