X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Fcyassl%2FMakefile;h=af4bc269bb164abfaaf3a808e500c0568853b4cf;hb=78d3b01e35350586c91026383e3c7865ddab5d90;hp=9e2080b4b476f90e4c60b7d777d97e1b101e24e2;hpb=b8d4f9b56d3d008788dfac49bbb33195a6494a3e;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/cyassl/Makefile b/libs/cyassl/Makefile
index 9e2080b4b4..af4bc269bb 100644
--- a/libs/cyassl/Makefile
+++ b/libs/cyassl/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2008 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,50 +8,49 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cyassl
-PKG_VERSION:=1.2.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.4.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=http://www.yassl.com/
-PKG_MD5SUM:=de12e76b3faf760107e45af487adcbde
+PKG_MD5SUM:=037397c7df84b9a12e614bf46135df1c
 
-include $(INCLUDE_DIR)/package.mk
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
-define Package/cyassl/Default
-  TITLE:=CyaSSL
-  URL:=http://www.yassl.com/
-endef
+include $(INCLUDE_DIR)/package.mk
 
 define Package/libcyassl
-  $(call Package/cyassl/Default)
   SECTION:=libs
   SUBMENU:=SSL
   CATEGORY:=Libraries
   DEPENDS:=+zlib
-  TITLE+= (library)
+  TITLE:=CyaSSL library
+  URL:=http://www.yassl.com/
 endef
 
 define Package/libcyassl/description
-	CyaSSL is an SSL library optimized for small footprint, both on disk and for memory use.
+CyaSSL is an SSL library optimized for small footprint, both on disk and for
+memory use.
 endef
 
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
-	--with-zlib="$(STAGING_DIR)/usr"
+	--without-zlib \
+	--enable-singleThreaded
 
 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))