From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 893BD6B1C1 for ; Wed, 17 Jul 2013 05:15:46 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.3) with ESMTP id r6H5FmwJ018538 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Tue, 16 Jul 2013 22:15:48 -0700 (PDT) Received: from pek-lpgbuild1.wrs.com (128.224.153.21) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.2.342.3; Tue, 16 Jul 2013 22:15:46 -0700 From: Ming Liu To: Date: Wed, 17 Jul 2013 13:15:43 +0800 Message-ID: <1374038143-5807-1-git-send-email-ming.liu@windriver.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 Subject: [PATCH] openssl: Fix multilib header conflict - opensslconf.h X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 05:15:46 -0000 Content-Type: text/plain opensslconf.h conflicts between 32-bit and 64-bit versions. Signed-off-by: Ming Liu --- 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