[Libreoffice-commits] core.git: 2 commits - external/liborcus solenv/gbuild

[Stephan Bergmann]

 external/liborcus/liborcus_0.1.0-dllimport.patch |    8 +++++++-
 solenv/gbuild/JunitTest.mk                       |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 7a4cc197910546d6fb3469806c406bf358ba0168
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 3 09:15:24 2014 +0200

    Also on Linux do not export symbols from static orcus libraries
    
    ...otherwise e.g. running CppunitTest_sc_filters_test under -fsanitize=address
    complains about ODR violation of 'vtable for orcus::csv::parse_error' exported
    from both libsclo.so and libscqahelper.so.
    
    A problem could potentially arise with exceptions thrown from static orcus code
    linked into library and intended to be caught in another, but hopefully all such
    exceptions are intended to be caught already locally anyway.
    
    Change-Id: Iff5c73d7a2324b457c2e86656c11b18f7ba210f6

diff --git a/external/liborcus/liborcus_0.1.0-dllimport.patch b/external/liborcus/liborcus_0.1.0-dllimport.patch
index 6255d06..7c91a77 100644
--- a/external/liborcus/liborcus_0.1.0-dllimport.patch
+++ b/external/liborcus/liborcus_0.1.0-dllimport.patch
@@ -1,6 +1,6 @@
 --- include/orcus/env.hpp
 +++ include/orcus/env.hpp
-@@ -35,14 +35,8 @@
+@@ -35,19 +35,13 @@
      #else
        #define ORCUS_DLLPUBLIC __declspec(dllexport)
      #endif
@@ -16,3 +16,9 @@
    #endif
    #define ORCUS_DLLLOCAL
  #else
+   #if __GNUC__ >= 4
+-    #define ORCUS_DLLPUBLIC __attribute__ ((visibility ("default")))
++    #define ORCUS_DLLPUBLIC
+     #define ORCUS_DLLLOCAL  __attribute__ ((visibility ("hidden")))
+   #else
+     #define ORCUS_DLLPUBLIC
commit 73db53f530ac1684da9428dd5a5e43f7fd9b5dab
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 3 09:14:11 2014 +0200

    This local hack was pushed by mistake
    
    ...as part of 5ab1098d5fbc1ba092da73af2b92e5bcdd7a3f8d "Generalize
    -fsanitize=address checks."
    
    Change-Id: I6141746b2d8059bd6bbcc466a86dd3da3c55f592

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index cc355df..9801ed2 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -54,7 +54,7 @@ $(call gb_JunitTest_get_target,%) :
 	$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(subst /lo/,/lo-4.2/,$(INSTROOT))/$(LIBO_URE_LIB_FOLDER)
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)
 $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
 $(eval $(call gb_JunitTest_JunitTest_platform,$(1)))