diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-04-23 11:23:17 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-04-23 11:23:38 +0200 |
| commit | 9a943e585a93f39d7b64d0490b66054f32eee068 (patch) | |
| tree | 9be32077d853ec5bd9dffb6c6d4c5d47d58eccbc | |
| parent | b760eff8cb65aba99b4527232140926bb4e11e82 (diff) | |
Fix linking with harfbuzz
Change-Id: Ic28c7922b0fab3b5a7ac1c0500a429539a4c29bc
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | harfbuzz/ExternalProject_harfbuzz.mk | 1 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 807150d2cdb7..15b694822a8a 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 ef1d823ce268..b82ec9772b00 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 69705ea0c5ae..824743814bcf 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 |