diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-30 14:10:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-01 10:39:55 +0200 |
| commit | e568d2ad00eaaf8b48420bc8e1ac32565d12baae (patch) | |
| tree | 941082782f9fd8a0b132acb1a8d347e64130dab5 | |
| parent | 623f89b373114b2034319a573184fe727fb1b33d (diff) | |
fontconfig: don't use gb_ExternalProject_use_packages directly
Change-Id: I4ebe1a8caded065043db997e34d5d2b205fcca20
| -rw-r--r-- | RepositoryExternal.mk | 7 | ||||
| -rw-r--r-- | fontconfig/ExternalProject_fontconfig.mk | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f072148fee0f..423834e53262 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) endef +gb_ExternalProject__use_freetype := + else ifeq ($(OS),ANDROID) define gb_LinkTarget__use_freetype_headers @@ -1056,6 +1058,11 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers) endef +define gb_ExternalProject__use_freetype +$(call gb_ExternalProject_use_package,$(1),freetype) + +endef + endif # SYSTEM_FREETYPE ifeq ($(SYSTEM_FONTCONFIG),YES) diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk index 64ccbe62a603..a956e70c0807 100644 --- a/fontconfig/ExternalProject_fontconfig.mk +++ b/fontconfig/ExternalProject_fontconfig.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,fontconfig)) -$(eval $(call gb_ExternalProject_use_packages,fontconfig,\ +$(eval $(call gb_ExternalProject_use_externals,fontconfig,\ expat \ freetype \ )) |