mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#42865: libcmis,ucpcmis: no mapfile

Browse Source 
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.
This commit is contained in:
Michael Stahl
2011-11-15 15:54:13 +01:00
parent 5f1799f579
commit a9da5a0bd3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libcmis/libcmis-0.1.0.patch
View File

@@ -1,6 +1,6 @@
--- misc/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:55:51.349325061 +0200 --- 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 +++ 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 -dummy
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+ +
@@ -9,6 +9,7 @@
+PRJNAME=libcmis +PRJNAME=libcmis
+TARGET=cmislib +TARGET=cmislib
+ENABLE_EXCEPTIONS=TRUE +ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
+LIBTARGET=NO +LIBTARGET=NO
+ +
+.INCLUDE : settings.mk +.INCLUDE : settings.mk

3
ucb/source/ucp/cmis/makefile.mk
View File

@@ -30,6 +30,7 @@ PRJNAME = ucb
UCPCMIS_MAJOR = 1 UCPCMIS_MAJOR = 1
TARGET = ucpcmis$(UCPCMIS_MAJOR).uno TARGET = ucpcmis$(UCPCMIS_MAJOR).uno
ENABLE_EXCEPTIONS = TRUE ENABLE_EXCEPTIONS = TRUE
VISIBILITY_HIDDEN=TRUE
NO_BSYMBOLIC = TRUE NO_BSYMBOLIC = TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
@@ -68,9 +69,9 @@ SHL1STDLIBS = \
$(CURLLIB) \ $(CURLLIB) \
$(LIBXML2LIB) $(LIBXML2LIB)
SHL1VERSIONMAP = $(SOLARENV)/src/component.map
SHL1TARGET = $(TARGET) SHL1TARGET = $(TARGET)
SHL1USE_EXPORTS = name
SHL1DEPN = SHL1DEPN =
SHL1IMPLIB = i$(TARGET) SHL1IMPLIB = i$(TARGET)
SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1LIBS = $(SLB)$/$(TARGET).lib