[Libreoffice-commits] core.git: Branch 'feature/commonsallayout' - external/harfbuzz

[Khaled Hosny]

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

New commits:
commit 82f3c06beeded71828da559818db8ee12b5028cf
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Sep 22 14:04:50 2016 -0700

    Fix building HarfBuzz with Graphite on non-Linux
    
    A very ugly hack as We don’t have pkg-config on non Linux platforms, so
    search for graphite2 always fails even though we set GRAPHITE2_LIBS etc.
    
    Change-Id: I0b663a4d0a2534c72b7317ec08d1656e3ce311e0

diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 5e98f9e..d733a5d 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 			$(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") \
+			$(if $(filter-out LINUX,$(OS)),PKG_CONFIG=true) \
 		&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \
 	)