From: Michael Heimpold <mhei@heimpold.de>
Date: Sat, 10 Jan 2015 15:33:32 +0000 (+0100)
Subject: libxml2: fix compilation on archlinux and gentoo
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=41a9c793c3d9f9d4eb1b22321108fd0009f56ec4;p=feed%2Fpackages.git

libxml2: fix compilation on archlinux and gentoo

Compilation of libxml2 on some distributions is problematic (at least
archlinux) for OpenWrt. This commit fixes the issue. Issue is caused
because configuration for some reason does not find gzopen from zlib.
This patch issues linker to include zlib anyway, if host system doesn't
have this issue, it is not a problem as linker should not link libs
twice anyway.

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>

Backported to BB to fix https://dev.openwrt.org/ticket/18295

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
---

diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile
index 1a7ed5d6a7..f9dac31921 100644
--- a/libs/libxml2/Makefile
+++ b/libs/libxml2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxml2
 PKG_VERSION:=2.9.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://gd.tuwien.ac.at/languages/libxml/ \
@@ -71,7 +71,7 @@ CONFIGURE_ARGS += \
 	--with-xinclude \
 	--with-xpath \
 	--with-xptr \
-	--with-zlib \
+	--with-zlib=$(STAGING_DIR)/usr \
 	--without-lzma
 
 define Build/InstallDev