summaryrefslogtreecommitdiff
path: root/unotools/source
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-08-13 12:28:14 +0200
committerCaolán McNamara <caolanm@redhat.com>2021-08-13 20:06:47 +0200
commitc820cb429fc3d3eec9bf6596f0a34995cbd93982 (patch)
treeea74b288385927891b407c1ee8079ed79a1479c4 /unotools/source
parent6f986e881c551ae218b95c162de67433901df85f (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 'unotools/source')
-rw-r--r--unotools/source/streaming/streamhelper.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index 63820352179d..b5f07e6a6a7f 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -113,6 +113,11 @@ void SAL_CALL OInputStreamHelper::closeInput()
m_xLockBytes = nullptr;
}
+void SAL_CALL OInputStreamHelper::acquire() SAL_NOEXCEPT
+{
+ cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable>::acquire();
+}
+
} // namespace utl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */