diff options
| author |   Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-12-02 12:20:01 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-05 22:42:48 +0000 |
| commit | 340c14ac49afa1559c12f8848bef9b6ecf24ef35 (patch) | |
| tree | b3a4b7f3d81b41e59e7d8f23d030c9ef5aa72ff0 /meta/recipes-connectivity/openssl/openssl.inc | |
| parent | fd2581770b8e4c42aa88f244daca58e27e11dff9 (diff) | |
| download | openembedded-core-contrib-340c14ac49afa1559c12f8848bef9b6ecf24ef35.tar.gz | |
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 <nitin.a.kamble@intel.com>
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl.inc')
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 15 |
1 files changed, 6 insertions, 9 deletions
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} |