diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2014-06-21 11:15:19 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2014-06-21 19:05:20 (GMT) |
| commit | 8335570a7b8d8cbaa86e223e3e40a07caaf2b255 (patch) | |
| tree | 145cbb41b2028cff3c1b42132d4afe1d7cee17ca /src/freetype.mk | |
| parent | ff52639735c7b1bd4b0219022e34e6454b9db5e8 (diff) | |
| download | mxe-8335570a7b8d8cbaa86e223e3e40a07caaf2b255.zip mxe-8335570a7b8d8cbaa86e223e3e40a07caaf2b255.tar.gz mxe-8335570a7b8d8cbaa86e223e3e40a07caaf2b255.tar.bz2 | |
let freetype2.pc deal with the harfbuzz circularity
Diffstat (limited to 'src/freetype.mk')
| -rw-r--r-- | src/freetype.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/freetype.mk b/src/freetype.mk index 3e09775..0f7c546 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -18,11 +18,15 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + # alias harfbuzz to handle linking circularity + $(if $(BUILD_STATIC),\ + ln -sf libharfbuzz.a '$(PREFIX)/$(TARGET)/lib/libharfbuzz_too.a',) cd '$(1)' && GNUMAKE=$(MAKE) ./configure \ $(MXE_CONFIGURE_OPTS) \ LIBPNG_CFLAGS="`$(TARGET)-pkg-config libpng --cflags`" \ LIBPNG_LDFLAGS="`$(TARGET)-pkg-config libpng --libs`" \ - FT2_EXTRA_LIBS="`$(TARGET)-pkg-config libpng --libs`" + FT2_EXTRA_LIBS="`$(TARGET)-pkg-config libpng --libs`" \ + $(if $(BUILD_STATIC),HARFBUZZ_LIBS="`$(TARGET)-pkg-config harfbuzz --libs` -lharfbuzz_too",) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install ln -sf '$(PREFIX)/$(TARGET)/bin/freetype-config' '$(PREFIX)/bin/$(TARGET)-freetype-config' |