From 340c14ac49afa1559c12f8848bef9b6ecf24ef35 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 2 Dec 2011 12:20:01 -0800 Subject: openssl-1.0.0e: fix to wotk with x32 toolchain Add BN_ADDR for address type instead of using BN_ULONG or unsigned long: 1. For W64, address type is unsigned long long, not unsigned long. 2. For x32, address type is unsigned long , not BN_ULONG. Added a new targetlinux-x32 in the config file The do_install() code to move lib/* to lib64 is not needed now with the enhanced multilib support. Make the x86-64 assembly syntax compatible with x32 compiler. Signed-off-by: Nitin A Kamble Signed-off-by: H.J. Lu Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl.inc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'meta/recipes-connectivity/openssl/openssl.inc') diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index c717fee514..771f146af9 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -82,6 +82,12 @@ do_configure () { linux-i686) target=debian-i386-i686/cmov ;; + linux-gnux32-x86_64) + target=linux-x32 + ;; + linux-gnu64-x86_64) + target=linux-x86_64 + ;; linux-mips) target=debian-mips ;; @@ -123,15 +129,6 @@ do_compile () { do_install () { oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install - # On x86_64, move lib/* to lib64 - if [ "${libdir}" != "${prefix}/lib" ] - then - install -m 0755 ${D}${libdir} ${D}${libdir}/pkgconfig - mv ${D}${prefix}/lib/lib* ${D}${libdir} - mv ${D}${prefix}/lib/pkgconfig/*.pc ${D}${libdir}/pkgconfig - chmod 644 ${D}${libdir}/pkgconfig/openssl.pc - fi - oe_libinstall -so libcrypto ${D}${libdir} oe_libinstall -so libssl ${D}${libdir} -- cgit 1.2.3-korg