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.
This commit is contained in:
Michael Stahl
2011-11-15 15:51:10 +01:00
parent c506e1852a
commit 5f1799f579
3 changed files with 16 additions and 3 deletions

View File

@@ -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

View File

@@ -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))

View File

@@ -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)