diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-08-02 00:10:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 00:10:18 (GMT) |
| commit | 12eb6e88c63574ca3403f2cff8d66a651e057db3 (patch) | |
| tree | 2b89ee5891244bf85cbfaeba1e3a8f639c606145 | |
| parent | fb3c10163aa984a01e7aac0aa887431f6a5d09e3 (diff) | |
| parent | eb7172fd2645ee64d39538467472a30b070ed7e5 (diff) | |
| download | mxe-12eb6e88c63574ca3403f2cff8d66a651e057db3.zip mxe-12eb6e88c63574ca3403f2cff8d66a651e057db3.tar.gz mxe-12eb6e88c63574ca3403f2cff8d66a651e057db3.tar.bz2 | |
Merge pull request #1866 from TobiX/harfbuzz-explicit
freetype: Don't autodetect harfbuzz.
| -rw-r--r-- | src/freetype-bootstrap.mk | 2 | ||||
| -rw-r--r-- | src/freetype.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/freetype-bootstrap.mk b/src/freetype-bootstrap.mk index b92057c..0ba9965 100644 --- a/src/freetype-bootstrap.mk +++ b/src/freetype-bootstrap.mk @@ -16,5 +16,5 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(freetype_BUILD_COMMON) + $(subst harfbuzz=yes,harfbuzz=no,$(freetype_BUILD_COMMON)) endef diff --git a/src/freetype.mk b/src/freetype.mk index 81a614b..b2e7d26 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -18,7 +18,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD_COMMON - cd '$(1)' && GNUMAKE=$(MAKE) ./configure \ + cd '$(1)' && GNUMAKE=$(MAKE) ./configure --with-harfbuzz=yes \ $(MXE_CONFIGURE_OPTS) \ LIBPNG_CFLAGS="`$(TARGET)-pkg-config libpng --cflags`" \ LIBPNG_LDFLAGS="`$(TARGET)-pkg-config libpng --libs`" \ |