d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

freetype: don't create harfbuzz alias during boostrap build

This commit is contained in:
Tony Theodore 2015-12-14 19:17:46 +11:00
parent 3dae2fee64
commit 5b3ca65fa5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freetype-bootstrap.mk
View File

@ -15,5 +15,5 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
$(freetype_BUILD)
$(freetype_BUILD_COMMON)
endef

12
src/freetype.mk
View File

@ -17,10 +17,7 @@ define $(PKG)_UPDATE
tail -1
endef
define $(PKG)_BUILD
# alias harfbuzz to handle linking circularity
$(if $(BUILD_STATIC),\
ln -sf libharfbuzz.a '$(PREFIX)/$(TARGET)/lib/libharfbuzz_too.a',)
define $(PKG)_BUILD_COMMON
cd '$(1)' && GNUMAKE=$(MAKE) ./configure \
$(MXE_CONFIGURE_OPTS) \
LIBPNG_CFLAGS="`$(TARGET)-pkg-config libpng --cflags`" \
@ -31,3 +28,10 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j 1 install
ln -sf '$(PREFIX)/$(TARGET)/bin/freetype-config' '$(PREFIX)/bin/$(TARGET)-freetype-config'
endef
define $(PKG)_BUILD
# alias harfbuzz to handle linking circularity
$(if $(BUILD_STATIC),\
ln -sf libharfbuzz.a '$(PREFIX)/$(TARGET)/lib/libharfbuzz_too.a',)
$($(PKG)_BUILD_COMMON)
endef