[packages] cyassl: update to 1.4.0 and new patches to fix makefiles

[openwrt/svn-archive/archive.git] / libs / cyassl / Makefile

diff --git a/libs/cyassl/Makefile b/libs/cyassl/Makefile
index 864005d6d483bb3946b4fa0e488494b5c7737654..ff84535118db30ba0ddbab35d82915b4e0601b93 100644 (file)
--- a/libs/cyassl/Makefile
+++ b/libs/cyassl/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -8,12 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cyassl
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.4.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=http://www.yassl.com/
-PKG_MD5SUM:=f8b6cdcc2c299c66c74b7e4305745350
+PKG_MD5SUM:=037397c7df84b9a12e614bf46135df1c
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,20 +37,19 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
-       --with-zlib="$(STAGING_DIR)/usr"
+       --with-libz="$(STAGING_DIR)/usr"
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include/ctaocrypt
-       $(CP) $(PKG_BUILD_DIR)/ctaocrypt/include/*.h $(1)/usr/include/ctaocrypt
-       
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/src/.libs/libcyassl.{a,so*} $(1)/usr/lib/
-       $(CP) $(PKG_BUILD_DIR)/src/libcyassl.la $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.{a,so*,la} $(1)/usr/lib/
 endef
 
 define Package/libcyassl/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/src/.libs/libcyassl.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libcyassl))