Kaynağa Gözat

freetype: only depend on zlib if it is available

The dependency is only there so zlib gets built before freetype if it's
available (for shared configure cache)
Peter Korsgaard 16 yıl önce
ebeveyn
işleme
309ff4f976
1 değiştirilmiş dosya ile 2 ekleme ve 1 silme
  1. 2 1
      package/freetype/freetype.mk

+ 2 - 1
package/freetype/freetype.mk

@@ -4,13 +4,14 @@
 #
 #
 #############################################################
 #############################################################
 FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
 FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
+#"))
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_LIBTOOL_PATCH = NO
 FREETYPE_LIBTOOL_PATCH = NO
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_INSTALL_TARGET = YES
 FREETYPE_INSTALL_TARGET = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = uclibc pkgconfig zlib
+FREETYPE_DEPENDENCIES = uclibc pkgconfig $(if $(BR2_PACKAGE_ZLIB,zlib)
 
 
 $(eval $(call AUTOTARGETS,package,freetype))
 $(eval $(call AUTOTARGETS,package,freetype))