diff options
| author | David Tardon <dtardon@redhat.com> | 2017-02-02 13:31:13 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-02-02 16:22:41 +0100 |
| commit | e060317a7a4f56fd04f5812ff8231455be521505 (patch) | |
| tree | 49f387e9348949d1283f16f128399bc649cb80f1 | |
| parent | 538c042d9ab27131d8d56d97b9a09dca516f8939 (diff) | |
fontconfig uses pkg-config to detect freetype now
Change-Id: I12cc3a8a36aeafd5184eee4051bc798c22769d8c
| -rw-r--r-- | RepositoryExternal.mk | 23 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | external/fontconfig/ExternalProject_fontconfig.mk | 1 |
3 files changed, 10 insertions, 17 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b00776c44d17..ed4ca9ce79f5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1266,12 +1266,6 @@ $(call gb_LinkTarget_set_include,$(1),\ endef -define gb_LinkTarget__use_freetype -$(call gb_LinkTarget_use_external,$(1),freetype_headers) -$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) - -endef - gb_ExternalProject__use_freetype := else @@ -1279,21 +1273,12 @@ else define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_use_external_project,$(1),freetype) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,freetype)/include \ + $(FREETYPE_CFLAGS) \ $$(INCLUDE) \ ) endef -define gb_LinkTarget__use_freetype -$(call gb_LinkTarget_use_external,$(1),freetype_headers) - -$(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,freetype)/instdir/lib -lfreetype \ -) - -endef - define gb_ExternalProject__use_freetype $(call gb_ExternalProject_use_external_project,$(1),freetype) @@ -1301,6 +1286,12 @@ endef endif # SYSTEM_FREETYPE +define gb_LinkTarget__use_freetype +$(call gb_LinkTarget_use_external,$(1),freetype_headers) +$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) + +endef + ifneq ($(SYSTEM_FONTCONFIG),) define gb_LinkTarget__use_fontconfig diff --git a/configure.ac b/configure.ac index 45d932889c04..7ab1286dc0ab 100644 --- a/configure.ac +++ b/configure.ac @@ -7925,6 +7925,9 @@ if test "$test_freetype" = "yes"; then FilterLibs "${FREETYPE_LIBS}" FREETYPE_LIBS="${filteredlibs}" SYSTEM_FREETYPE=TRUE +else + FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include" + FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib -lfreetype" fi AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index 83387e31e7ef..0fa3364fd08e 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -26,7 +26,6 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : $(if $(filter ANDROID,$(OS)),--with-arch=arm) \ --with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \ --with-expat-lib=$(gb_StaticLibrary_WORKDIR) \ - --with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ && $(MAKE) \ ) |