diff options
| author | Damiano Galassi <[email protected]> | 2017-01-18 10:47:13 +0100 |
|---|---|---|
| committer | Damiano Galassi <[email protected]> | 2017-01-18 12:11:12 +0100 |
| commit | 81550230adc2359d7ec4f5cff6a5c960b7df7e6e (patch) | |
| tree | 6cc1e547017c494c4e54156054d597eb321c8ced /contrib/harfbuzz | |
| parent | 922db9bec26e1def4c8ba60afb2147cc06ec524d (diff) | |
disable fontconfig on macOS
Diffstat (limited to 'contrib/harfbuzz')
| -rw-r--r-- | contrib/harfbuzz/module.defs | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs index f252c0417..07415f3f3 100644 --- a/contrib/harfbuzz/module.defs +++ b/contrib/harfbuzz/module.defs @@ -1,4 +1,9 @@ -__deps__ := FONTCONFIG FREETYPE +__deps__ := FREETYPE + +ifneq ($(BUILD.system),darwin) + __deps__ += FONTCONFIG +endif + $(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__))) $(eval $(call import.CONTRIB.defs,HARFBUZZ)) @@ -6,16 +11,20 @@ HARFBUZZ.FETCH.url = https://download.handbrake.fr/handbrake/contrib/harfbuz HARFBUZZ.FETCH.url += https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.3.0.tar.bz2 HARFBUZZ.FETCH.sha256 = b04be31633efee2cae1d62d46434587302554fa837224845a62565ec68a0334d -# Tell configure where to find our versions of freetype and fontconfig +# Tell configure where to find our version of freetype HARFBUZZ.CONFIGURE.extra = \ - --with-fontconfig=yes --with-freetype=yes \ + --with-freetype=yes \ FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \ FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \ - FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \ - FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include" -ifeq ($(BUILD.system),darwin) - HARFBUZZ.CONFIGURE.extra += --with-coretext=no --with-glib=no +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 endif ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) |