From af431dbe673e2135f912d07479e4b964f5583246 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 12 Aug 2009 01:21:49 -0400 Subject: openssl.inc: fix packaging on x86_64; use INC_PR openssl's makefile always installs to ${prefix}/lib, even if libdir is ${prefix}/lib64. Move some files around to make it fit. Signed-off-by: Michael Smith --- recipes/openssl/openssl.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'recipes/openssl/openssl.inc') diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc index 3972cd3bd9..fea05f84e9 100644 --- a/recipes/openssl/openssl.inc +++ b/recipes/openssl/openssl.inc @@ -6,6 +6,8 @@ SECTION = "libs/network" SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz" S = "${WORKDIR}/openssl-${PV}" +INC_PR = "r10" + AR_append = " r" CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ -DTERMIO ${FULL_OPTIMIZATION} -Wall" @@ -94,9 +96,16 @@ do_stage () { } do_install () { - install -m 0755 -d ${D}${libdir}/pkgconfig oe_runmake INSTALL_PREFIX="${D}" install - chmod 644 ${D}${libdir}/pkgconfig/openssl.pc + + # On x86_64, move lib/* to lib64 + if [ "${libdir}" != "${prefix}/lib" ] + then + install -d ${D}${libdir} ${D}${libdir}/pkgconfig + mv ${D}${prefix}/lib/lib* ${D}${libdir} + mv ${D}${prefix}/lib/pkgconfig/*.pc ${D}${libdir}/pkgconfig + fi + oe_libinstall -so libcrypto ${D}${libdir} oe_libinstall -so libssl ${D}${libdir} } -- cgit 1.2.3-korg