[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - jvmaccess/inc jvmaccess/util RepositoryExternal.mk solenv/inc
Damjan Jovanovic
damjan at apache.org
Sat Mar 31 10:10:42 UTC 2018
RepositoryExternal.mk | 15 ++++++++++++++-
jvmaccess/inc/jvmaccess/unovirtualmachine.hxx | 4 ++++
jvmaccess/inc/jvmaccess/virtualmachine.hxx | 4 ++++
jvmaccess/util/gcc3.map | 8 ++++----
jvmaccess/util/mingw.map | 8 ++++----
solenv/inc/libs.mk | 3 +--
6 files changed, 31 insertions(+), 11 deletions(-)
New commits:
commit c4fa038b68d36e8b91ed7613180761bbe86f21e9
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Mar 31 08:16:54 2018 +0000
The main/jvmaccess module stubbornly refuses to build on all setups.
As per https://gcc.gnu.org/wiki/Visibility
it turns out that GCC needs a typeinfo lookup when exceptions are
thrown between different shared libraries. This means main/jvmaccess
needs to export typeinfos for its exception classes. However on
Windows this breaks the build due to missing array new in its
base class, so typeinfos mustn't be exported for the build to
succeed. Thus, we don't export the typeinfo from the exception
classes on Windows, but we do export it on other setups.
(The more I work with C++, the more I hate it.)
Patch by: me
diff --git a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
index 1e85c131fd30..b20b7bad984d 100644
--- a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
@@ -40,7 +40,11 @@ class UnoVirtualMachine: public salhelper::SimpleReferenceObject {
public:
/** An exception indicating failure to create a UnoVirtualMachine.
*/
+#if defined _MSC_VER
class CreationException
+#else
+ class JVMACCESS_DLLPUBLIC CreationException
+#endif
{
public:
JVMACCESS_DLLPUBLIC CreationException();
diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
index 8ea6136bf342..6d28c1da3422 100644
--- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
+++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx
@@ -59,7 +59,11 @@ public:
public:
/** An exception indicating failure to create an AttachGuard.
*/
+#if defined _MSC_VER
class CreationException
+#else
+ class JVMACCESS_DLLPUBLIC CreationException
+#endif
{
public:
JVMACCESS_DLLPUBLIC CreationException();
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 1df8c297a15b..1bc94dc25a1b 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -28,8 +28,8 @@ UDK_3.1 {
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
- # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
- # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
+ _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
+ _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
_ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
@@ -68,8 +68,8 @@ UDK_3.3 {
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &)
- # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException
- # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException
+ _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException
+ _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException
_ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
_ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
_ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const
diff --git a/jvmaccess/util/mingw.map b/jvmaccess/util/mingw.map
index f2e39856b231..f1d811c13261 100644
--- a/jvmaccess/util/mingw.map
+++ b/jvmaccess/util/mingw.map
@@ -28,8 +28,8 @@ UDK_3_0_0 {
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
- # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
- # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
+ _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
+ _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
_ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
_ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
@@ -52,8 +52,8 @@ UDK_3_0_0 {
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
_ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &)
- # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException
- # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException
+ _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException
+ _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException
_ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
_ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
_ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const
commit e5c11d0abae6fec9c3b6b43f8d27f4b488a3bf06
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Mar 31 08:12:05 2018 +0000
Library naming fixes for main/lingucomponent libraries on *nix.
Patch by: me
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 14b24a772cb7..8cb3a5d5a4e5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -585,7 +585,8 @@ endef
else # !SYSTEM_LIBTEXTCAT
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- libtextcat \
+ libtextcat \
+ textcat \
))
define gb_LinkTarget__use_libtextcat
@@ -640,7 +641,13 @@ endef
else # !SYSTEM_HUNSPELL
+ifeq ($(GUI),WNT)
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,libhunspell))
+else ifeq ($(GUI),OS2)
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,hunspell))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,hunspell-1.3))
+endif
define gb_LinkTarget__use_hunspell
$(call gb_LinkTarget_set_include,$(1),\
@@ -650,7 +657,13 @@ $(call gb_LinkTarget_set_include,$(1),\
$(call gb_LinkTarget_add_defs,$(1),\
-DHUNSPELL_STATIC
)
+ifeq ($(GUI),WNT)
$(call gb_LinkTarget_add_linked_static_libs,$(1),libhunspell)
+else ifeq ($(GUI),OS2)
+$(call gb_LinkTarget_add_linked_static_libs,$(1),hunspell)
+else
+$(call gb_LinkTarget_add_linked_static_libs,$(1),hunspell-1.3)
+endif
endef
endif # SYSTEM_HUNSPELL
commit f51349620d80bceab628f35615c2518215dc8931
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Mar 31 08:11:35 2018 +0000
Fix the dmake name for "vos", now that main/vos/version.mk
has been deleted.
Patch by: me
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 3d95f8c1f3b1..153e2eabd3e5 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -103,8 +103,7 @@ REGLIB=-lreg$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
REGLIB=-lreg
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.INCLUDE .IGNORE : vos/version.mk
-VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
+VOSLIB=-lvos3$(COMID)
XMLOFFLIB=-lxo$(DLLPOSTFIX)
XMLOFFLLIB=-lxol
.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
More information about the Libreoffice-commits
mailing list