Skip to content

V
vlc-2-2
Commit e72c10bf authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf
Browse files
Options

contrib: make sure freetype depends on zlib 

(cherry picked from commit 8f6f849be5322de77a5acc0a6d8e1fe978000573)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 49c4c7aa
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
contrib/src/freetype2/rules.mak
View file @ e72c10bf
...@@ -15,10 +15,13 @@ $(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.gz: ...@@ -15,10 +15,13 @@ $(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.gz:
freetype: freetype-$(FREETYPE2_VERSION).tar.gz .sum-freetype2 freetype: freetype-$(FREETYPE2_VERSION).tar.gz .sum-freetype2
$(UNPACK) $(UNPACK)
$(call pkg_static, "builds/unix/freetype2.in")
$(MOVE) $(MOVE)
DEPS_freetype = zlib $(DEPS_zlib)
.freetype2: freetype .freetype2: freetype
sed -i.orig s/-ansi// $</builds/unix/configure 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 cd $< && $(MAKE) && $(MAKE) install
touch $@ touch $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment