X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Flibgcrypt%2FMakefile;h=20ee8073598402d7d25ecd9c6e91170833347db2;hb=7fbdd87db46696c16f7a967fe685825777fa5bb7;hp=87397d920de33d18db91934f460205df02bc4263;hpb=20a500cf00129d6dd28c0b509b25fed5f4e827c5;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile
index 87397d920d..20ee807359 100644
--- a/libs/libgcrypt/Makefile
+++ b/libs/libgcrypt/Makefile
@@ -1,23 +1,23 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2005-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgcrypt
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.4.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://ftp.gnupg.org/gcrypt/libgcrypt/
-PKG_MD5SUM:=49810175ab672b19a02509d2a670b156
+PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+PKG_MD5SUM:=cc2017ad09b4543f8b3b5e9a53cfd89d
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,47 +30,36 @@ define Package/libgcrypt
 endef
 
 define Package/libgcrypt/description
-	This is a general purpose cryptographic library based on the code from 
-	GnuPG. It provides functions for all cryptograhic building blocks: 
-	symmetric ciphers (AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash 
-	algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all 
-	hash algorithms), public key algorithms (RSA, ElGamal, DSA), large 
-	integer functions, random numbers and a lot of supporting functions.
+ This is a general purpose cryptographic library based on the code from 
+ GnuPG. It provides functions for all cryptograhic building blocks: 
+ symmetric ciphers (AES, DES, Arcfour), hash algorithms (MD5, SHA-1,
+ RIPE-MD160, SHA-224/256, SHA-384/512), MACs (HMAC for all hash
+ algorithms), public key algorithms (RSA, DSA), large integer functions,
+ random numbers and a lot of supporting functions. Some algorithms have
+ been disabled to reduce size (Blowfish, CAST5, Twofish, Serpent,
+ RC2, SEED, Camellia, CRC, MD4, TIGER-192, Whirlpool, ElGamal, ECC).
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--disable-asm \
-		--with-gpg-error-prefix="$(STAGING_DIR)/usr" \
-	)
-endef
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-asm \
+	--with-gpg-error-prefix="$(STAGING_DIR)/usr" \
+	--enable-digests="md5 rmd160 sha1 sha256 sha512" \
+	--enable-ciphers="arcfour des aes" \
+	--enable-pubkey-ciphers="rsa dsa" \
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+TARGET_CFLAGS += $(FPIC)
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/share/aclocal
+	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/share/aclocal
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{la,a,so*} $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(1)/usr/share/aclocal/
-	$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(1)/usr/bin/libgcrypt-config
-	$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/libgcrypt-config
-	ln -sf $(1)/usr/bin/libgcrypt-config $(2)/bin/
-endef
-
-define Build/UninstallDev
-	rm -rf \
-		$(1)/usr/bin/libgcrypt-config \
-		$(2)/bin/libgcrypt-config \
-		$(1)/usr/include/gcrypt*.h \
-		$(1)/usr/lib/libgcrypt.{a,so*} \
-		$(1)/usr/share/aclocal/libgcrypt.m4
+	$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/libgcrypt-config
+	$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/libgcrypt-config
+	ln -sf $(STAGING_DIR)/usr/bin/libgcrypt-config $(2)/bin/
 endef
 
 define Package/libgcrypt/install