From patchwork Sun Oct 21 15:37:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 193031 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 ED3872C008C for ; Mon, 22 Oct 2012 02:38:11 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id BE3753FBAE for ; Sun, 21 Oct 2012 17:38:10 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by hugin.dotsrc.org (Postfix) with ESMTPS id 129F93FBAE for ; Sun, 21 Oct 2012 17:38:09 +0200 (CEST) Received: by mail-we0-f179.google.com with SMTP id z49so959240wey.10 for ; Sun, 21 Oct 2012 08:38:09 -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=65lJteYmR7b3YEQc3L6y2iy8AsatYJF1+krGo2Gzy74=; b=IvTaDIbb5rUCjfapTcBGoQ9PmPoBN23kOZJcIT4xj0zeo0CwyX8CiM/Z4P77wuOdBO qufMH3R2+H8W/3VPcSsWvysdYTVLp5pXpIsrAliBof6VVfz/o+zyZLLnfcTGjkEWc4si hAU0WWFBHxqn+GSeAQYtfy7SdI3zn4PNZBfhzQDC0Zzd4yJQ3cqrH/JEtuLH8yys1yER 88d9LDNljM46O8KvfadUsQSiEPPWKUycyPy2Ia7glYmxxd3hZKkDnTAAKwcTqW1kWyqy b1TqfbpjVx9EppIkq7ZIfOFu6ytJsiLXOz5iTv+lL1ixjS6DsLldppO27Px+N3CJEI2u +TgA== Received: by 10.216.207.93 with SMTP id m71mr3603977weo.201.1350833888911; Sun, 21 Oct 2012 08:38:08 -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.07 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Oct 2012 08:38:08 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 07/16] libxml2: don't use ldl dependency with mingw32 Date: Sun, 21 Oct 2012 17:37:46 +0200 Message-Id: <1350833876-9499-7-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 --- recipes/libxml/libxml2.inc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/recipes/libxml/libxml2.inc b/recipes/libxml/libxml2.inc index ac3993c..ef4a854 100644 --- a/recipes/libxml/libxml2.inc +++ b/recipes/libxml/libxml2.inc @@ -6,8 +6,10 @@ inherit autotools pkgconfig library binconfig SRC_URI = "ftp://xmlsoft.org/${PN}/${PN}-${PV}.tar.gz" -DEPENDS = "libdl libm" -RDEPENDS_${PN} = "libdl libm" +DEPENDS = "${DEPENDS_LIBDL} libm" +DEPENDS_LIBDL = "libdl" +DEPENDS_LIBDL:TARGET_OS_mingw32 = "" +RDEPENDS_${PN} = "${DEPENDS}" EXTRA_OECONF = "\ --without-legacy \ @@ -16,10 +18,12 @@ EXTRA_OECONF = "\ --without-python \ --with-c14n" -export LDFLAGS += "-ldl" +LDFLAGS_LDL = "-ldl" +LDFLAGS_LDL:TARGET_OS_mingw32 = "" +export LDFLAGS += "${LDFLAGS_LDL}" PACKAGES =+ "${PN}-utils" -FILES_${PN} = "${libexecdir}/* ${libdir}/lib*${SOLIBS} \ +FILES_${PN} = "${libexecdir}/* ${sharedlibdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ ${base_libdir}/*${SOLIBS} \ ${datadir}/${PN} ${libdir}/${PN}/* \ @@ -27,5 +31,5 @@ FILES_${PN} = "${libexecdir}/* ${libdir}/lib*${SOLIBS} \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" -FILES_${PN}-utils = "${bindir}/xmllint ${bindir}/xmlcatalog ${libdir}/*.sh" +FILES_${PN}-utils = "${bindir}/xmllint* ${bindir}/xmlcatalog* ${libdir}/*.sh" FILES_${PN}-doc += "${datadir}/gtk-doc"