Re: pkg/45103 (security/openssl fails to build on Solaris10 with gcc in 64bit mode)

["Filip Hajny" <filip%joyent.com@localhost>]

On 20. 7. 2011, at 15:00, Tim Zingelman wrote:

> Sorry... you must perhaps also set MACHINE_ARCH=x86_64 in mk.conf
> because uname returns i386 even for 64-bit on Solaris/intel.
> 
> Does this solve it?
> 
> I agree we need a better way... so if ABI=64 && cpu is intel and OS is
> SunOS that MACHINE_ARCH is set correctly by the infrastructure.
> 

FYI I have been doing this on my local git repo, works fine.

-F

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 953d587..a5c5d9b 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -55,7 +55,11 @@ CONFIGURE_ARGS+=     shared threads no-fips
 .  if ${MACHINE_ARCH} == "sparc"
 OPENSSL_MACHINE_ARCH=  ${SPARC_TARGET_ARCH}
 .  elif ${MACHINE_ARCH} == "i386"
+.    if !empty(ABI:M64)
+OPENSSL_MACHINE_ARCH=  x86_64
+.    else
 OPENSSL_MACHINE_ARCH=  x86
+.    endif
 .  elif ${MACHINE_ARCH} == "x86_64"
 OPENSSL_MACHINE_ARCH=  ${MACHINE_ARCH}
 .  endif