From patchwork Fri Jul 25 10:27:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 373645 X-Patchwork-Delegate: chbs@prevas.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 [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id A56131400D2 for ; Fri, 25 Jul 2014 20:27:50 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id A77B53FB51 for ; Fri, 25 Jul 2014 12:27:48 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 07E7C3FB51 for ; Fri, 25 Jul 2014 12:27:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2399; q=dns/txt; s=ironport1; t=1406284067; x=1437820067; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=3OoTHfnnyWoVqDWQgffy2UhSrVqHqFEJMDNvN5qBH40=; b=sbBWxDoixbLAvaDjSq6BWWGAVQpCqo0dMOzCPI9ArJVmNYXYsmNv7UpG 4iyUaPoGATlSzi2QybhX1Y6lI4oc4a5icAMuuYlKUX79UmdxqBNSBosn/ f+aiHZrbgHhbGkPktlbANn5LCb/gFquFb8iWbMHL8Nc3K5VvMOo1eT9R7 c=; X-IronPort-AV: E=Sophos;i="5.01,730,1400018400"; d="scan'208";a="4929042" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 25 Jul 2014 12:27:46 +0200 Received: from VMPREVAS1.prevas.se ([fe80::d582:e193:281c:3bc9]) by VMPREVAS3.prevas.se ([172.16.8.103]) with mapi id 14.02.0387.000; Fri, 25 Jul 2014 12:27:46 +0200 From: =?iso-8859-1?Q?Christian_Br=E4uner_S=F8rensen?= To: Svend Aage Vedstesen , "dev@oe-lite.org" Subject: RE: [PATCH 13/15] qmake5.inc: Make RDEPEND on shared objects and split into more packages Thread-Topic: [PATCH 13/15] qmake5.inc: Make RDEPEND on shared objects and split into more packages Thread-Index: AQHPm1GUXZDyp1uCWUqi17nI5Gs+u5uwr3uW Date: Fri, 25 Jul 2014 10:27:45 +0000 Message-ID: References: , <016660e847e6937bdd77bc835714c464d95ba639.1404891982.git.Svend.Vedstesen@prevas.dk> In-Reply-To: <016660e847e6937bdd77bc835714c464d95ba639.1404891982.git.Svend.Vedstesen@prevas.dk> Accept-Language: en-GB, sv-SE, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.16.11.11] MIME-Version: 1.0 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: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org Hi Svend Aaage Thanks for the patch! Merged to master. /Christian diff --git a/recipes/qt5/qmake5.inc b/recipes/qt5/qmake5.inc index f3569ff..b39d0f3 100644 --- a/recipes/qt5/qmake5.inc +++ b/recipes/qt5/qmake5.inc @@ -143,9 +143,28 @@ do_install_mingw_fixup () { FILES_${PN} += " ${libdir}" +PACKAGES =+ "${PN}-libs" +DEPENDS_${PN} += "${PN}-libs" +RDEPENDS_${PN} += "${PN}-libs" +# Make libs hold shared objects only - to be used in the SDK +FILES_${PN}-libs = "${libdir}/*.so*" + +PACKAGES =+ "${PN}-cmake" +FILES_${PN}-cmake = "${libdir}/cmake" + +PACKAGES =+ "${PN}-plugins" +DEPENDS_${PN} += "${PN}-plugins" +RDEPENDS_${PN} += "${PN}-plugins" +FILES_${PN}-plugins = "${libdir}/qt5/plugins" + +PACKAGES =+ "${PN}-mkspecs" +DEPENDS_${PN} += "${PN}-mkspecs" +RDEPENDS_${PN} += "${PN}-mkspecs" +FILES_${PN}-mkspecs = "${libdir}/qt5/mkspecs" + PACKAGES =+ " ${PN}-utilities " FILES_${PN}-utilities = "${bindir}" DEPENDS_${PN} += "${PN}-utilities" EXTRA_RDEPENDS_UTILITIES = "librt" EXTRA_RDEPENDS_UTILITIES:HOST_LIBC_mingw = "" -RDEPENDS_${PN}-utilities = "${EXTRA_RDEPENDS_UTILITIES} libgcc libpthread libz libstdc++ libm" +RDEPENDS_${PN}-utilities = "${EXTRA_RDEPENDS_UTILITIES} ${PN}-libs libgcc libpthread libz libstdc++ libm"