[Libreoffice-commits] core.git: harfbuzz/ExternalProject_harfbuzz.mk RepositoryExternal.mk vcl/Library_vcl.mk

[Fridrich Å trba]

 RepositoryExternal.mk                |    2 +-
 harfbuzz/ExternalProject_harfbuzz.mk |    1 +
 vcl/Library_vcl.mk                   |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 9a943e585a93f39d7b64d0490b66054f32eee068
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Apr 23 11:23:17 2013 +0200

    Fix linking with harfbuzz
    
    Change-Id: Ic28c7922b0fab3b5a7ac1c0500a429539a4c29bc

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 807150d..15b6948 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1186,7 +1186,7 @@ endef
 
 endif # SYSTEM_ICU
 
-ifeq ($(ENABLE_HARFBUZZ),YES)
+ifeq ($(ENABLE_HARFBUZZ),TRUE)
 ifeq ($(SYSTEM_HARFBUZZ),YES)
 
 define gb_LinkTarget__use_harfbuzz
diff --git a/harfbuzz/ExternalProject_harfbuzz.mk b/harfbuzz/ExternalProject_harfbuzz.mk
index ef1d823..b82ec97 100644
--- a/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/harfbuzz/ExternalProject_harfbuzz.mk
@@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 		&& ./configure \
 			--enable-static \
 			--disable-shared \
+			--with-pic \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) libharfbuzz.la) \
 	)
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 69705ea..8247438 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -110,6 +110,12 @@ $(eval $(call gb_Library_use_externals,vcl,\
 ))
 endif
 
+ifeq ($(ENABLE_HARFBUZZ),TRUE)
+$(eval $(call gb_Library_use_externals,vcl,\
+	harfbuzz \
+))
+endif
+
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/app/brand \
     vcl/source/app/dbggui \
@@ -347,7 +353,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 endif
 
 $(eval $(call gb_Library_use_external,vcl,graphite))
-$(eval $(call gb_Library_use_external,vcl,harfbuzz))
 
 endif