diff options
author | Michael Stahl <mstahl@redhat.com> | 2011-11-15 15:54:13 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2011-11-15 20:52:01 +0100 |
commit | a9da5a0bd3631370dfed0c285440c3252c6daf3a (patch) | |
tree | c5596cda5ae4ae25a1b4fdc0343fecaa240c1386 | |
parent | 5f1799f57978bb9accfe59fb5bc38d01686441b6 (diff) |
fdo#42865: libcmis,ucpcmis: no mapfile
In order to not have the offending local _ZNSs4_Rep20_S_empty_rep_storageE
symbol in ucpcmis1.uno.so, build it and statically linked libcmis
with hidden visibility.
-rw-r--r-- | libcmis/libcmis-0.1.0.patch | 3 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/makefile.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libcmis/libcmis-0.1.0.patch b/libcmis/libcmis-0.1.0.patch index 48c2482963df..d81520b0e525 100644 --- a/libcmis/libcmis-0.1.0.patch +++ b/libcmis/libcmis-0.1.0.patch @@ -1,6 +1,6 @@ --- misc/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:55:51.349325061 +0200 +++ misc/build/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:54:58.290853952 +0200 -@@ -1 +1,38 @@ +@@ -1 +1,39 @@ -dummy +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE + @@ -9,6 +9,7 @@ +PRJNAME=libcmis +TARGET=cmislib +ENABLE_EXCEPTIONS=TRUE ++VISIBILITY_HIDDEN=TRUE +LIBTARGET=NO + +.INCLUDE : settings.mk diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk index 4f43c29b38c3..be4a36c65515 100644 --- a/ucb/source/ucp/cmis/makefile.mk +++ b/ucb/source/ucp/cmis/makefile.mk @@ -30,6 +30,7 @@ PRJNAME = ucb UCPCMIS_MAJOR = 1 TARGET = ucpcmis$(UCPCMIS_MAJOR).uno ENABLE_EXCEPTIONS = TRUE +VISIBILITY_HIDDEN=TRUE NO_BSYMBOLIC = TRUE .INCLUDE : settings.mk @@ -68,9 +69,9 @@ SHL1STDLIBS = \ $(CURLLIB) \ $(LIBXML2LIB) -SHL1VERSIONMAP = $(SOLARENV)/src/component.map SHL1TARGET = $(TARGET) +SHL1USE_EXPORTS = name SHL1DEPN = SHL1IMPLIB = i$(TARGET) SHL1LIBS = $(SLB)$/$(TARGET).lib |