summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-01 12:32:53 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-01 12:32:53 +0000
commit77c87e07cfa1eee90e87eb33bd6c981a2157fa5e (patch)
tree87b6a23d79a232628e7b31f936caa21d31d4e376
parent88767171b31f33afe6b7ae171a095d57bff72e07 (diff)
fix openssl with zlib-dynamic (closes: #1182), bump release number
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8299 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/zlib/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 066a39978..15407d5a3 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zlib
PKG_VERSION:=1.2.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
@@ -62,8 +62,10 @@ define Build/UninstallDev
$(STAGING_DIR)/usr/lib/libz.{a,so*}
endef
+# libz.so is needed for openssl (zlib-dynamic)
define Package/zlib/install
$(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
endef