From: Daniel Laird <danieljlaird@hotmail.com>
Date: Fri, 10 Oct 2008 14:41:18 +0000 (-0000)
Subject: package/libxml2/libxml2.mk: Bounce version to 2.6.32
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ad0984bfa8e56152dcf9d0573bd8b3384093f6b9;p=buildroot.git

package/libxml2/libxml2.mk: Bounce version to 2.6.32

Bounce the version to 2.6.32.
And deal with the left over .rej files.

Daniel Laird
---

diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 5dceb2faa0..c6eab9d20c 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -3,7 +3,7 @@
 # libxml2
 #
 #############################################################
-LIBXML2_VERSION = 2.6.31
+LIBXML2_VERSION = 2.6.32
 LIBXML2_SOURCE = libxml2-sources-$(LIBXML2_VERSION).tar.gz
 LIBXML2_SITE = ftp://xmlsoft.org/libxml2
 LIBXML2_INSTALL_STAGING = YES
@@ -23,6 +23,10 @@ LIBXML2_DEPENDENCIES = uclibc
 
 $(eval $(call AUTOTARGETS,package,libxml2))
 
+$(LIBXML2_HOOK_POST_EXTRACT):
+	rm -f $(LIBXML2_DIR)/win32/Makefile.msvc.rej
+	rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
+
 $(LIBXML2_HOOK_POST_INSTALL):
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
 	$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config