From patchwork Sun Oct 21 15:37:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 193026 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id 29DCB2C008C for ; Mon, 22 Oct 2012 02:38:08 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id ECC973FBAE for ; Sun, 21 Oct 2012 17:38:06 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by hugin.dotsrc.org (Postfix) with ESMTPS id 4A0EA3FBAE for ; Sun, 21 Oct 2012 17:38:03 +0200 (CEST) Received: by mail-wi0-f169.google.com with SMTP id hq4so1337063wib.4 for ; Sun, 21 Oct 2012 08:38:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=1Kc0OTnoJU+zYmHaKZHdybp3PHFzzXDljdLV6034aAo=; b=W885GNCoMmYYTxWd1vLPrgz1ZvsLmFqmFTMS4mWoQk+S14Zsoeuq53hF2oj34mJ1fv 3rTY7tSnUx2/TQDChA/dlbbMeXlIuOmtqQvjkMRQIjESTksaMEQRjitS4hmqumiSvdgl 7QGt2BJcFESl2EujeYkOkb+hbP4Ys5YkxQDcG56+JO2Ggg02goAl+AE6asuLbKs35pjp LfuG8A0MBGinMMxuzTlSy0r+Lwo07JVyb8yiJwy24WgnbjBtVQ5/a5X4BTNcwgsky4nO d6T03CXJxfmw397kIndtMUzEwfS6KACUC+cbbA4mukdH4xBHTaMfkPONkTGewCUmoFvz ppBA== Received: by 10.180.100.101 with SMTP id ex5mr31184835wib.16.1350833882600; Sun, 21 Oct 2012 08:38:02 -0700 (PDT) Received: from localhost.localdomain (dom38-1-82-236-154-183.fbx.proxad.net. [82.236.154.183]) by mx.google.com with ESMTPS id gm7sm16535929wib.10.2012.10.21.08.38.01 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Oct 2012 08:38:01 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 02/16] openssl: add override for darwin Date: Sun, 21 Oct 2012 17:37:41 +0200 Message-Id: <1350833876-9499-2-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350833876-9499-1-git-send-email-diorcet.yann@gmail.com> References: <1350833876-9499-1-git-send-email-diorcet.yann@gmail.com> Cc: Yann Diorcet X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Yann Diorcet Make it works on darwin --- recipes/openssl/openssl.inc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc index 66c243d..7bfcf5b 100644 --- a/recipes/openssl/openssl.inc +++ b/recipes/openssl/openssl.inc @@ -10,9 +10,9 @@ inherit c make pkgconfig SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz" -DEPENDS = "${DEPENDS_HOST_OS}" -DEPENDS_HOST_OS = "libdl" -DEPENDS_HOST_OS:HOST_OS_mingw32 = "" +DEPENDS = "${DEPENDS_TARGET_OS}" +DEPENDS_TARGET_OS = "libdl" +DEPENDS_TARGET_OS:TARGET_OS_mingw32 = "" CFLAG = "${@['-DL_ENDIAN', '-DB_ENDIAN']['${TARGET_ENDIAN}'=='b']} ${TARGET_CFLAGS}" CFLAG:>TARGET_OS_linux-gnu = " -DTERMIO" @@ -69,6 +69,9 @@ do_configure () { darwin-i386) target=darwin-i386-cc ;; + darwin-x86_64) + target=darwin64-x86_64-cc + ;; mingw32-*) target=mingw ;; @@ -98,7 +101,7 @@ do_install () { fi install -d ${D}${includedir} - cp --dereference -R include/openssl ${D}${includedir} + cp -L -R include/openssl ${D}${includedir} } RDEPENDS_${PN} += " ${PN}-libcrypto ${PN}-libssl ${PN}-engines ${PN}-misc" @@ -107,6 +110,7 @@ PACKAGES =+ "${PN}-misc ${PN}-engines" FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf" FILES_${PN}-engines = "${libdir}/ssl/engines/*.so" FILES_${PN}-engines:TARGET_OS_mingw32 = "${libdir}/ssl/engines/*.dll" +FILES_${PN}-engines:TARGET_OS_darwin = "${libdir}/ssl/engines/*.dylib" FILES_${PN}-dbg =+ "${libdir}/ssl/engines/.debug" FILES_${PN}-doc =+ "${libdir}/ssl/man" @@ -122,5 +126,5 @@ LIBSSL_FILES = "" LIBSSL_FILES:TARGET_OS_mingw32 = "${sharedlibdir}/ssleay32.dll" DEPENDS_${PN}-libcrypto += " ${DEPENDS}" DEPENDS_${PN}-libssl += " ${DEPENDS}" -RDEPENDS_${PN}-libcrypto += "libc libgcc libdl" -RDEPENDS_${PN}-libssl += "libc libdl libcrypto" +RDEPENDS_${PN}-libcrypto += "libc libgcc ${DEPENDS_TARGET_OS}" +RDEPENDS_${PN}-libssl += "libc ${DEPENDS_TARGET_OS} libcrypto"