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 <ming.liu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index f5b24324ba59ed9c1c15a3893a749fa96adff13f..78ff7ae2f1078b77afa0bf7bc947fef4366cb3f5 100644 (file)
--- 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"