浏览代码

openssl: fix arch handling

Closes #497

Use ARCH instead of BR2_ARCH as BR2_ARCH won't match because of the
surrounding quotes.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 16 年之前
父节点
当前提交
2a966bcd3b
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 1 0
      CHANGES
  2. 4 4
      package/openssl/openssl.mk

+ 1 - 0
CHANGES

@@ -46,6 +46,7 @@
 	#451: Upgrade from unmaintained dosfstools-2.11 to dosfstools-3.0.3
 	#451: Upgrade from unmaintained dosfstools-2.11 to dosfstools-3.0.3
 	#467: DirectFB 1.4.1
 	#467: DirectFB 1.4.1
 	#473: memstat_0.5.tar.gz has install with -D and that fails "make"
 	#473: memstat_0.5.tar.gz has install with -D and that fails "make"
+	#497: OpenSSL RSA key generation hangs on x86_64
 
 
 2009.05, Released June 1st, 2009:
 2009.05, Released June 1st, 2009:
 
 

+ 4 - 4
package/openssl/openssl.mk

@@ -9,16 +9,16 @@ OPENSSL_SITE:=http://www.openssl.org/source
 OPENSSL_TARGET_ARCH=generic32
 OPENSSL_TARGET_ARCH=generic32
 
 
 # Some architectures are optimized in OpenSSL
 # Some architectures are optimized in OpenSSL
-ifeq ($(BR2_ARCH),avr32)
+ifeq ($(ARCH),avr32)
 OPENSSL_TARGET_ARCH=avr32
 OPENSSL_TARGET_ARCH=avr32
 endif
 endif
-ifeq ($(BR2_ARCH),ia64)
+ifeq ($(ARCH),ia64)
 OPENSSL_TARGET_ARCH=ia64
 OPENSSL_TARGET_ARCH=ia64
 endif
 endif
-ifeq ($(BR2_ARCH),powerpc)
+ifeq ($(ARCH),powerpc)
 OPENSSL_TARGET_ARCH=ppc
 OPENSSL_TARGET_ARCH=ppc
 endif
 endif
-ifeq ($(BR2_ARCH),x86_64)
+ifeq ($(ARCH),"x86_64")
 OPENSSL_TARGET_ARCH=x86_64
 OPENSSL_TARGET_ARCH=x86_64
 endif
 endif