[vlc-commits] contrib: freetype: avoid circular dependency with harfbuzz

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Sat Sep  6 18:12:21 2014 +0200| [88a86b3961a210457b998604056d6a04fb6ba097] | committer: Jean-Baptiste Kempf

contrib: freetype: avoid circular dependency with harfbuzz

(cherry picked from commit 5b58faa2468f0699c6e6f402ea03f489f4360441)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=88a86b3961a210457b998604056d6a04fb6ba097
---

 contrib/src/freetype2/rules.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/freetype2/rules.mak b/contrib/src/freetype2/rules.mak
index 9f5ad23..d8547d3 100644
--- a/contrib/src/freetype2/rules.mak
+++ b/contrib/src/freetype2/rules.mak
@@ -22,6 +22,6 @@ DEPS_freetype = zlib $(DEPS_zlib)
 
 .freetype2: freetype
 	sed -i.orig s/-ansi// $</builds/unix/configure
-	cd $< && GNUMAKE=$(MAKE) $(HOSTVARS) ./configure --with-zlib=yes --without-png $(HOSTCONF)
+	cd $< && GNUMAKE=$(MAKE) $(HOSTVARS) ./configure --with-harfbuzz=no --with-zlib=yes --without-png $(HOSTCONF)
 	cd $< && $(MAKE) && $(MAKE) install
 	touch $@