[oe-commits] Ming Liu : openssl: Fix multilib header conflict - opensslconf.h

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 9b1ba604793015aad15c442f590464d0c224794c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9b1ba604793015aad15c442f590464d0c224794c

Author: Ming Liu <ming.liu at windriver.com>
Date:   Mon Jul 29 09:53:16 2013 +0800

openssl: Fix multilib header conflict - opensslconf.h

opensslconf.h conflicts between 32-bit and 64-bit versions.

Signed-off-by: Ming Liu <ming.liu at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-connectivity/openssl/openssl.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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"