diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-11-15 15:51:10 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-11-15 20:52:00 +0100 |
| commit | 5f1799f57978bb9accfe59fb5bc38d01686441b6 (patch) | |
| tree | 53423aca26ed181ca353df3b4296d85d231f35d4 | |
| parent | c506e1852af6605c97b2194df95a0810fd42b3aa (diff) | |
fdo#42865: libexttextcat,lingucomponent: no mapfile
In order to not have the offending local _ZNSs4_Rep20_S_empty_rep_storageE
symbol in libguesslanglo.so, build both it and libexttextcat
with hidden visibility.
| -rw-r--r-- | libexttextcat/libexttextcat-3.2.0-visibility.patch | 10 | ||||
| -rw-r--r-- | libexttextcat/makefile.mk | 4 | ||||
| -rw-r--r-- | lingucomponent/source/languageguessing/makefile.mk | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/libexttextcat/libexttextcat-3.2.0-visibility.patch b/libexttextcat/libexttextcat-3.2.0-visibility.patch new file mode 100644 index 000000000000..a4104b78fcb1 --- /dev/null +++ b/libexttextcat/libexttextcat-3.2.0-visibility.patch @@ -0,0 +1,10 @@ +--- misc/libexttextcat-3.2.0/src/makefile.mk 2011-10-07 00:09:38.000000000 +0200 ++++ misc/build/libexttextcat-3.2.0/src/makefile.mk 2011-11-15 13:57:19.742958488 +0100 +@@ -33,6 +33,7 @@ + + USE_DEFFILE=TRUE + EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++VISIBILITY_HIDDEN=TRUE + UWINAPILIB= + + .INCLUDE : settings.mk diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk index e4b8fc5c8a8a..b90a4d70bb7d 100644 --- a/libexttextcat/makefile.mk +++ b/libexttextcat/makefile.mk @@ -47,8 +47,12 @@ all: TARFILE_NAME=libexttextcat-3.2.0 TARFILE_MD5=e1c178b18f130b40494561f02bc1a948 TARFILE_ROOTDIR=libexttextcat-3.2.0 +PATCH_FILES=libexttextcat-3.2.0-visibility.patch .IF "$(GUI)"=="UNX" +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +EXTRA_CFLAGS+=-fvisibility=hidden +.ENDIF #relative to CONFIGURE_DIR CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk index 40d3157b0993..5fe1945ed60d 100644 --- a/lingucomponent/source/languageguessing/makefile.mk +++ b/lingucomponent/source/languageguessing/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=lingucomponent TARGET=guesslang ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE #----- Settings --------------------------------------------------------- @@ -71,13 +72,11 @@ SHL1STDLIBS= \ $(UNOTOOLSLIB) # build DLL +SHL1USE_EXPORTS = name SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1IMPLIB= i$(TARGET) SHL1DEPN= $(SHL1LIBS) SHL1DEF= $(MISC)$/$(SHL1TARGET).def -.IF "$(OS)"!="MACOSX" -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -.ENDIF # build DEF file DEF1NAME =$(SHL1TARGET) |