[Buildroot] [git commit] openssl: fix arch handling

[Buildroot] [git commit] openssl: fix arch handling

[Peter Korsgaard]

commit: http://git.buildroot.net/buildroot/commit/?id=2a966bcd3bbf0323add5bc5426107bb3af24767d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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>
---
 CHANGES                    |    1 +
 package/openssl/openssl.mk |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 77c4398..c1bfe38 100644
--- a/CHANGES
+++ b/CHANGES
@@ -46,6 +46,7 @@
 	#451: Upgrade from unmaintained dosfstools-2.11 to dosfstools-3.0.3
 	#467: DirectFB 1.4.1
 	#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:
 
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index a0e6f7e..16938f4 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -9,16 +9,16 @@ OPENSSL_SITE:=http://www.openssl.org/source
 OPENSSL_TARGET_ARCH=generic32
 
 # Some architectures are optimized in OpenSSL
-ifeq ($(BR2_ARCH),avr32)
+ifeq ($(ARCH),avr32)
 OPENSSL_TARGET_ARCH=avr32
 endif
-ifeq ($(BR2_ARCH),ia64)
+ifeq ($(ARCH),ia64)
 OPENSSL_TARGET_ARCH=ia64
 endif
-ifeq ($(BR2_ARCH),powerpc)
+ifeq ($(ARCH),powerpc)
 OPENSSL_TARGET_ARCH=ppc
 endif
-ifeq ($(BR2_ARCH),x86_64)
+ifeq ($(ARCH),"x86_64")
 OPENSSL_TARGET_ARCH=x86_64
 endif
 
-- 
1.6.3.3

[Buildroot] [git commit] openssl: fix arch handling

[Thomas Petazzoni]

Le Wed, 29 Jul 2009 21:49:45 +0200,
Peter Korsgaard <jacmet@sunsite.dk> a ?crit :

> -ifeq ($(BR2_ARCH),x86_64)
> +ifeq ($(ARCH),"x86_64")

unless I'm wrong this should be

ifeq ($(ARCH),x86_64)

just like the others. Or

ifeq ($(BR2_ARCH),"x86_64")

BTW, any clue why we have quotes around the value of BR2_ARCH ?

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [git commit] openssl: fix arch handling

[Bernhard Reutner-Fischer]

On Wed, Jul 29, 2009 at 10:09:19PM +0200, Thomas Petazzoni wrote:

>ifeq ($(BR2_ARCH),"x86_64")
>
>BTW, any clue why we have quotes around the value of BR2_ARCH ?

project/Makefile.in:ARCH:=$(strip $(subst ",, $(BR2_ARCH)))
scripts/test/Makefile:  @echo   $(strip $(subst ",,$(BR2_ARCH)))
target/Config.in.arch:config BR2_ARCH

i.e. it's a string.

[Buildroot] [git commit] openssl: fix arch handling

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Le Wed, 29 Jul 2009 21:49:45 +0200,
 Thomas> Peter Korsgaard <jacmet@sunsite.dk> a ?crit :

 >> -ifeq ($(BR2_ARCH),x86_64)
 >> +ifeq ($(ARCH),"x86_64")

 Thomas> unless I'm wrong this should be

 Thomas> ifeq ($(ARCH),x86_64)

 Thomas> just like the others. Or

 Thomas> ifeq ($(BR2_ARCH),"x86_64")

Argh yes, I need sleep - Will fix asap.

 Thomas> BTW, any clue why we have quotes around the value of BR2_ARCH ?

Kconfig does it for string variables.

-- 
Bye, Peter Korsgaard