[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-1' - external/harfbuzz

[Michael Stahl]

 external/harfbuzz/ExternalProject_harfbuzz.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 548e0bf3d134049b8079ae33a019ef8805c96b47
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 18 14:06:35 2016 +0100

    fdo#94009: harfbuzz: don't export symbols from VCL
    
    Should fix crashes due to symbol clashes in ELF global namespace
    where system's libharfbuzz.so.0 is loaded as well.
    
    Change-Id: I35ffcbe4ac4de5a25cd8bf0cb9a8f0c11f4554c5
    (cherry picked from commit 549130ab5d9616f7eb5504db31546b386737ccb2)
    Reviewed-on: https://gerrit.libreoffice.org/22480
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 37f7d9ee1d9399c5aa5e9975579f319b1fa045dc)
    Reviewed-on: https://gerrit.libreoffice.org/22504

diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 52db533..c287a22 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -33,6 +33,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 			--with-glib=no \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(filter LINUX,$(OS)),CXXFLAGS="$(CXXFLAGS) -fvisibility=hidden") \
 		&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \
 	)