]> git.sesse.net Git - vlc/commitdiff
contrib: make sure freetype depends on zlib
authorRafaël Carré <funman@videolan.org>
Sat, 6 Sep 2014 16:09:58 +0000 (18:09 +0200)
committerRafaël Carré <funman@videolan.org>
Sat, 6 Sep 2014 16:11:58 +0000 (18:11 +0200)
contrib/src/freetype2/rules.mak

index bbbf05bba77f837a0453aa929e321356b0edfa7a..9f5ad237438de51c0d23a636875f30e444c7a968 100644 (file)
@@ -15,10 +15,13 @@ $(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.gz:
 
 freetype: freetype-$(FREETYPE2_VERSION).tar.gz .sum-freetype2
        $(UNPACK)
+       $(call pkg_static, "builds/unix/freetype2.in")
        $(MOVE)
 
+DEPS_freetype = zlib $(DEPS_zlib)
+
 .freetype2: freetype
        sed -i.orig s/-ansi// $</builds/unix/configure
-       cd $< && GNUMAKE=$(MAKE) $(HOSTVARS) ./configure --without-png $(HOSTCONF)
+       cd $< && GNUMAKE=$(MAKE) $(HOSTVARS) ./configure --with-zlib=yes --without-png $(HOSTCONF)
        cd $< && $(MAKE) && $(MAKE) install
        touch $@