summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorMing Liu <ming.liu@windriver.com>2013-07-29 09:53:16 +0800
committerSaul Wold <sgw@linux.intel.com>2013-07-29 23:04:01 -0700
commit9b1ba604793015aad15c442f590464d0c224794c (patch)
tree50de032152f9de0d60e72881d0d72851063497bf /meta/recipes-connectivity
parent61e864e2d020c820cf90807b48babee3b24f9446 (diff)
downloadopenembedded-core-9b1ba604793015aad15c442f590464d0c224794c.tar.gz
openembedded-core-9b1ba604793015aad15c442f590464d0c224794c.tar.bz2
openembedded-core-9b1ba604793015aad15c442f590464d0c224794c.zip
openssl: Fix multilib header conflict - opensslconf.h
opensslconf.h conflicts between 32-bit and 64-bit versions. Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index f5b24324ba..78ff7ae2f1 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"