diff options
| author | Oleg Oshmyan <[email protected]> | 2017-03-10 21:54:32 +0200 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2017-04-09 13:05:45 -0600 |
| commit | 8400436ece413cb3109376224d11f6ee5b5cf274 (patch) | |
| tree | 61309f9d95e9b10d74e0e6cdfb3e516873b8c7ce | |
| parent | 47819a1cd5dbba570290c87d943ccd0c23fc759e (diff) | |
HarfBuzz: disable Fontconfig (#609)
HarfBuzz uses Fontconfig only in command-line utilities, which we don't need.
(cherry picked from commit 1f6c91c00be0f8f47de1d5c77b945ad6ecd50ec5)
| -rw-r--r-- | contrib/harfbuzz/module.defs | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs index 07415f3f3..064c92f22 100644 --- a/contrib/harfbuzz/module.defs +++ b/contrib/harfbuzz/module.defs @@ -1,9 +1,5 @@ __deps__ := FREETYPE -ifneq ($(BUILD.system),darwin) - __deps__ += FONTCONFIG -endif - $(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__))) $(eval $(call import.CONTRIB.defs,HARFBUZZ)) @@ -17,14 +13,10 @@ HARFBUZZ.CONFIGURE.extra = \ FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \ FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \ -ifneq ($(BUILD.system),darwin) - # Tell configure where to find our version of fontconfig - HARFBUZZ.CONFIGURE.extra += \ - --with-fontconfig=yes \ - FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \ - FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include" -else - HARFBUZZ.CONFIGURE.extra += --with-coretext=yes --with-fontconfig=no --with-glib=no +HARFBUZZ.CONFIGURE.extra += --with-fontconfig=no + +ifeq ($(BUILD.system),darwin) + HARFBUZZ.CONFIGURE.extra += --with-coretext=yes --with-glib=no endif ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) |