From 567eee4f544b553165897e9732ed4f4d9ab8db98 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 4 Oct 2010 11:44:51 -0300 Subject: openssl: Bump to 1.0.0a Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/openssl/openssl.mk | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'package/openssl/openssl.mk') diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 22b14f255..de20b8191 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -3,19 +3,28 @@ # openssl # ############################################################# -OPENSSL_VERSION:=0.9.8o -OPENSSL_SITE:=http://www.openssl.org/source + +OPENSSL_VERSION = 1.0.0a +OPENSSL_SITE = http://www.openssl.org/source OPENSSL_INSTALL_STAGING = YES OPENSSL_DEPENDENCIES = zlib - -OPENSSL_TARGET_ARCH=generic32 +OPENSSL_TARGET_ARCH = generic32 # Some architectures are optimized in OpenSSL +ifeq ($(ARCH),arm) +ifneq ($(BR2_generic_arm),y) +ifneq ($(BR2_arm610),y) +ifneq ($(BR2_arm710),y) + OPENSSL_TARGET_ARCH = armv4 +endif +endif +endif +endif ifeq ($(ARCH),powerpc) -OPENSSL_TARGET_ARCH=ppc + OPENSSL_TARGET_ARCH = ppc endif ifeq ($(ARCH),x86_64) -OPENSSL_TARGET_ARCH=x86_64 + OPENSSL_TARGET_ARCH = x86_64 endif define OPENSSL_CONFIGURE_CMDS -- cgit v1.2.3