opensslconf.h conflicts between 32-bit and 64-bit versions. Signed-off-by: Ming Liu <ming....@windriver.com> --- meta/recipes-connectivity/openssl/openssl.inc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index f5b2432..267eb89 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -5,7 +5,7 @@ BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html"; SECTION = "libs/network" # Big Jump for OpenSSL 1.0 support with meta-oe -INC_PR = "r15" +INC_PR = "r16" # "openssl | SSLeay" dual license LICENSE = "openssl" @@ -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" -- 1.7.1 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
