Patchwork [V1] openssl: Fix multilib header conflict - opensslconf.h

login
register
mail settings
Submitter Ming Liu
Date July 29, 2013, 1:53 a.m.
Message ID <1375062796-13686-1-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/54629/
State Accepted
Commit 9b1ba604793015aad15c442f590464d0c224794c
Headers show

Comments

Ming Liu - July 29, 2013, 1:53 a.m.
opensslconf.h conflicts between 32-bit and 64-bit versions.

Signed-off-by: Ming Liu <ming.liu@windriver.com>
---
 meta/recipes-connectivity/openssl/openssl.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch

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"