diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/fontconfig.mk | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/fontconfig.mk')
| -rw-r--r-- | src/fontconfig.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/fontconfig.mk b/src/fontconfig.mk index 2df4a8b..2992c44 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -1,14 +1,11 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# fontconfig PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.0 -$(PKG)_CHECKSUM := 570fb55eb14f2c92a7b470b941e9d35dbfafa716 +$(PKG)_CHECKSUM := 1ab2f437c2261028ae7969892277af2d8d8db489 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://fontconfig.org/ $(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE) $(PKG)_DEPS := gcc freetype expat @@ -22,11 +19,10 @@ define $(PKG)_BUILD # ensure there is no (buggy) attempt to install the *.dll.a file # (remove this line of you want to link dynamically) $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/src/Makefile.in' - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' $(SED) -i 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' '$(1)/fontconfig.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-arch='$(TARGET)' \ |