From c3301973d87119aedabc663d4c68043a2b49ace5 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 29 Jul 2013 09:53:16 +0800 Subject: [PATCH] openssl: Fix multilib header conflict - opensslconf.h opensslconf.h conflicts between 32-bit and 64-bit versions. (From OE-Core rev: 9b1ba604793015aad15c442f590464d0c224794c) Signed-off-by: Ming Liu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index f5b2432..78ff7ae 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -31,7 +31,7 @@ export DIRS = "crypto ssl apps" export EX_LIBS = "-lgcc -ldl" export AS = "${CC} -c" -inherit pkgconfig siteinfo +inherit pkgconfig siteinfo multilib_header PACKAGES =+ "libcrypto libssl ${PN}-misc" FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}" @@ -145,6 +145,7 @@ do_install () { cp --dereference -R include/openssl ${D}${includedir} sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl + oe_multilib_header openssl/opensslconf.h } BBCLASSEXTEND = "native nativesdk" -- 2.7.4