diff options
| -rw-r--r-- | src/freetype-bootstrap.mk | 2 | ||||
| -rw-r--r-- | src/freetype.mk | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/freetype-bootstrap.mk b/src/freetype-bootstrap.mk index 472bf84..bea0cbd 100644 --- a/src/freetype-bootstrap.mk +++ b/src/freetype-bootstrap.mk @@ -15,5 +15,5 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(freetype_BUILD) + $(freetype_BUILD_COMMON) endef diff --git a/src/freetype.mk b/src/freetype.mk index c5ea74d..b282a16 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -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 |