From patchwork Tue Jan 14 12:33:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 310641 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 [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id E1F732C00B1 for ; Tue, 14 Jan 2014 23:35:56 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 4E3E540060 for ; Tue, 14 Jan 2014 13:35:56 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id D71073FEB7 for ; Tue, 14 Jan 2014 13:35:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=4703; q=dns/txt; s=ironport2; t=1389702904; x=1421238904; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=EhwkiEQXhHRKfLDgJVXwKZAS2Z72t+z8smSclPw2DvA=; b=dMzfVdPpK+AR/+cNxSjYhTjaqrmzYAjJSHlJ51pHKtR9KZzhFE8PO2/4 jqiKrQhLuS4UyTepAtX3mXgwNBipL/JreyuVt+yNKg4EMfFQO+VjmClP0 rKyntw+lYcjb415XyYRoApQxFLxp8kUAj0xJgGSMZG37qjy7bxkNETra0 c=; X-IronPort-AV: E=Sophos;i="4.95,658,1384297200"; d="scan'208";a="196356" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 14 Jan 2014 13:35:02 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Tue, 14 Jan 2014 13:35:01 +0100 Received: by localhost (Postfix, from userid 30007) id 9B6EF681586; Tue, 14 Jan 2014 12:35:01 +0000 (UTC) From: To: Subject: [PATCH 037/131] glib: Change packinging, and fix DEPENDS/RDEPENDS for all packages Date: Tue, 14 Jan 2014 12:33:24 +0000 Message-ID: <7b59f94089684e03ec45efeb65b3ed8f5876690c.1389702652.git.christian.braunersorensen@prevas.dk> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: 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 From: Christian Sørensen Signed-off-by: Christian Sørensen --- recipes/glib/glib-2.34.0.inc | 4 ++-- recipes/glib/glib-common.inc | 55 +++++++++++++++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/recipes/glib/glib-2.34.0.inc b/recipes/glib/glib-2.34.0.inc index 7399667..ceabb89 100644 --- a/recipes/glib/glib-2.34.0.inc +++ b/recipes/glib/glib-2.34.0.inc @@ -1,2 +1,2 @@ -DEPENDS_${PN}-libglib += "${DEPENDS_THREADS}" -DEPENDS_${PN}-libgmodule += "${DEPENDS_THREADS}" +DEPENDS_${PN}-libglib-2.0 += "${DEPENDS_THREADS}" +DEPENDS_${PN}-libgmodule-2.0 += "${DEPENDS_THREADS}" diff --git a/recipes/glib/glib-common.inc b/recipes/glib/glib-common.inc index 9815130..50ce797 100644 --- a/recipes/glib/glib-common.inc +++ b/recipes/glib/glib-common.inc @@ -9,7 +9,8 @@ inherit c++ autotools DEPENDS = "host-cross:gtk-doc libz libffi libelf" DEPENDS += "${DEPENDS_NATIVE}" -DEPENDS_NATIVE = "native:libglib native:libgthread native:libgmodule native:glib-utils" +DEPENDS_NATIVE = "native:libglib-2.0 native:libgthread-2.0 \ + native:libgmodule-2.0 native:glib-utils" DEPENDS_NATIVE:native = "" DEPENDS += "${DEPENDS_LIBDL}" @@ -55,8 +56,7 @@ FILES_${PN}-doc += "${datadir}/gtk-doc" FILES_${PN}-dev += "${datadir}/glib-2.0 ${libdir}/gdbus-2.0" inherit auto-package-libs -AUTO_PACKAGE_LIBS = "glib gobject gmodule gthread gio" -AUTO_PACKAGE_LIBS_LIBDIR = "${libdir}:lib:-2.0" +AUTO_PACKAGE_LIBS = "glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 gio-2.0" AUTO_PACKAGE_LIBS_RDEPENDS = "${PN}" AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}" AUTO_PACKAGE_LIBS_DEV_RDEPENDS = "${PN}-dev_${PV}" @@ -67,15 +67,44 @@ DEPENDS_FAM = "" DEPENDS_PCRE = "" DEPENDS_${PN} += "libffi" -DEPENDS_${PN}-utils += "${PN}-libgio" -DEPENDS_${PN}-libglib += "libc libgcc ${DEPENDS_PCRE} ${DEPENDS_LIBDL} ${DEPENDS_LIBINTL} ${DEPENDS_LIBRESOLV}" -DEPENDS_${PN}-libgthread += "libc libglib ${DEPENDS_THREADS} ${DEPENDS_PCRE}" -DEPENDS_${PN}-libgobject += "libc libgcc libffi libglib libgthread ${DEPENDS_THREADS} ${DEPENDS_PCRE}" -DEPENDS_${PN}-libgmodule += "libc ${DEPENDS_LIBDL} libglib ${DEPENDS_PCRE}" -DEPENDS_${PN}-libgio += "libc libgcc ${DEPENDS_LIBDL} ${DEPENDS_LIBRESOLV} libz libffi libglib libgmodule libgobject libgthread ${DEPENDS_PCRE} ${DEPENDS_THREADS}" - -FILES_${PN}-libgio-dev = "${libdir}/pkgconfig/gio-*-2.0.pc" -FILES_${PN}-libgmodule-dev = "${libdir}/pkgconfig/gmodule-*-2.0.pc" +DEPENDS_${PN}-utils += "libgio-2.0 libglib-2.0 libgmodule-2.0 libgobject-2.0 \ + libelf" +RDEPENDS_GLIB_UTILS = "libc libdl libffi libgio-2.0 libgmodule-2.0 \ + libgoject-2.0 libpcre libpthread libresolv libz" +RDEPENDS_GLIB_UTILS:native = "" +RDEPENDS_${PN}-utils = "${RDEPENDS_GLIB_UTILS}" +DEPENDS_${PN}-libglib-2.0 += "libc libgcc ${DEPENDS_PCRE} ${DEPENDS_LIBDL} \ + ${DEPENDS_LIBINTL} ${DEPENDS_LIBRESOLV} \ + ${DEPENDS_THREADS}" +DEPENDS_${PN}-libgthread-2.0 += "libc ${DEPENDS_THREADS} ${DEPENDS_PCRE} \ + libglib-2.0" +DEPENDS_${PN}-libgobject-2.0 += "libc libgcc libffi libgthread-2.0 \ + ${DEPENDS_THREADS} ${DEPENDS_PCRE} \ + libglib-2.0" +DEPENDS_${PN}-libgmodule-2.0 += "libc ${DEPENDS_LIBDL} ${DEPENDS_PCRE} \ + libglib-2.0 ${DEPENDS_THREADS}" +DEPENDS_${PN}-libgio-2.0 += "libc libgcc ${DEPENDS_LIBDL} ${DEPENDS_LIBRESOLV} \ + libz libffi libglib-2.0 libgmodule-2.0 \ + libgobject-2.0 libgthread-2.0 ${DEPENDS_PCRE} \ + ${DEPENDS_THREADS}" + +FILES_${PN}-libgio-2.0-dev += "${libdir}/pkgconfig/gio-*-2.0.pc" +FILES_${PN}-libgmodule-2.0-dev += "${libdir}/pkgconfig/gmodule-*-2.0.pc" FILES_${PN} += "${libdir}/charset.alias" -include glib-${PV}.inc +#To be removed in next base master release! +PROVIDES_${PN}-libglib-2.0 += "libglib" +PROVIDES_${PN}-libglib-2.0-dev += "libglib-dev" +PROVIDES_${PN}-libglib-2.0[qa] += "allow-missing-soname:libglib" +PROVIDES_${PN}-libgobject-2.0 += "libgobject" +PROVIDES_${PN}-libgobject-2.0-dev += "libgobject-dev" +PROVIDES_${PN}-libgobject-2.0[qa] += "allow-missing-soname:libgobject" +PROVIDES_${PN}-libgmodule-2.0 += "libgmodule" +PROVIDES_${PN}-libgmodule-2.0-dev += "libgmodule-dev" +PROVIDES_${PN}-libgmodule-2.0[qa] += "allow-missing-soname:libgmodule" +PROVIDES_${PN}-libgthread-2.0 += "libgthread" +PROVIDES_${PN}-libgthread-2.0-dev += "libgthread-dev" +PROVIDES_${PN}-libgthread-2.0[qa] += "allow-missing-soname:libgthread" +PROVIDES_${PN}-libgio-2.0 += "libgio" +PROVIDES_${PN}-libgio-2.0-dev += "libgio-dev" +PROVIDES_${PN}-libgio-2.0[qa] += "allow-missing-soname:libgio"