[Astlinux-commits] SF.net SVN: astlinux:[6363] branches/1.0/package/libxml2/libxml2.mk

[<abe...@us...>]

Revision: 6363
          http://sourceforge.net/p/astlinux/code/6363
Author:   abelbeck
Date:     2014-01-18 03:44:02 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
libxml2, version bump to 2.9.1

Modified Paths:
--------------
    branches/1.0/package/libxml2/libxml2.mk

Modified: branches/1.0/package/libxml2/libxml2.mk
===================================================================
--- branches/1.0/package/libxml2/libxml2.mk	2014-01-18 01:23:34 UTC (rev 6362)
+++ branches/1.0/package/libxml2/libxml2.mk	2014-01-18 03:44:02 UTC (rev 6363)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBXML2_VERSION = 2.9.0
+LIBXML2_VERSION = 2.9.1
 LIBXML2_SITE = ftp://xmlsoft.org/libxml2
 LIBXML2_INSTALL_STAGING = YES
 
@@ -19,23 +19,36 @@
 	$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
 	ln -snf $(STAGING_DIR)/usr/include/libxml2/libxml $(STAGING_DIR)/usr/include/libxml
 endef
-
 LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
 
 HOST_LIBXML2_DEPENDENCIES = host-pkg-config
 
 HOST_LIBXML2_CONF_OPT = --without-debug --without-python
 
+ifneq ($(BR2_HAVE_DEVFILES),y)
 define LIBXML2_REMOVE_CONFIG_SCRIPTS
-	$(RM) -f $(TARGET_DIR)/usr/bin/xml2-config
+	rm -f $(TARGET_DIR)/usr/bin/xml2-config
 endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_REMOVE_CONFIG_SCRIPTS
 endif
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBXML2_DEPENDENCIES += zlib
+LIBXML2_CONF_OPT += --with-zlib
+else
+LIBXML2_CONF_OPT += --without-zlib
+endif
+
+LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
+ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y)
+LIBXML2_CONF_OPT += --with-iconv
+else
+LIBXML2_CONF_OPT += --without-iconv
+endif
+
 $(eval $(call AUTOTARGETS,package,libxml2))
 $(eval $(call AUTOTARGETS,package,libxml2,host))
 
 # libxml2 for the host
-LIBXML2_HOST_BINARY:=$(HOST_DIR)/usr/bin/xmllint
+LIBXML2_HOST_BINARY = $(HOST_DIR)/usr/bin/xmllint

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.