summaryrefslogtreecommitdiff
path: root/package/openssl/openssl.mk
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2010-10-04 11:44:51 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2010-10-18 11:18:12 +0200
commit567eee4f544b553165897e9732ed4f4d9ab8db98 (patch)
tree18fbafaf7628b670d030e645338d8103c9b1438b /package/openssl/openssl.mk
parentfe5945a043a294d5abdfe530858d707211efefbc (diff)
openssl: Bump to 1.0.0a
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/openssl/openssl.mk')
-rw-r--r--package/openssl/openssl.mk21
1 files changed, 15 insertions, 6 deletions
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