From: Lars-Peter Clausen <lars@metafoo.de>
Date: Fri, 19 Feb 2010 04:11:47 +0000 (+0000)
Subject: [packages] bahamut: Don't use hosts zlib
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=287a4c0cbd6e6e4394c7f810e0b9ac498f2a0d01;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] bahamut: Don't use hosts zlib


SVN-Revision: 19729
---

diff --git a/net/bahamut/Makefile b/net/bahamut/Makefile
index 43954c92cd..5092463c51 100644
--- a/net/bahamut/Makefile
+++ b/net/bahamut/Makefile
@@ -34,6 +34,7 @@ define Build/Configure
 		--with-openssl="$(STAGING_DIR)/usr/lib" \
 		,\
 		ac_cv_func_dn_skipname=yes \
+		ZLIB_HOME="$(STAGING_DIR)/usr" \
 	)
 endef
 
diff --git a/net/bahamut/patches/010-dont-use-host-zlib.patch b/net/bahamut/patches/010-dont-use-host-zlib.patch
new file mode 100644
index 0000000000..ef8029ce5a
--- /dev/null
+++ b/net/bahamut/patches/010-dont-use-host-zlib.patch
@@ -0,0 +1,16 @@
+diff --git a/configure b/configure
+index 4ef7659..c774c65 100755
+--- a/configure
++++ b/configure
+@@ -8009,11 +8009,6 @@ fi
+ # zlib test
+ # ripped from http://autoconf-archive.cryp.to/check_zlib.html
+ #
+-ZLIB_HOME=/usr/local
+-if test ! -f "${ZLIB_HOME}/include/zlib.h"
+-then
+-        ZLIB_HOME=/usr
+-fi
+ if test -n "${ZLIB_HOME}"
+ then
+         ZLIB_OLD_LDFLAGS=$LDFLAGS