summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-12-10 15:23:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-13 15:18:43 +0000
commit4809890ae56f428413601072852e81f9a59ff891 (patch)
tree4a5720705c19038c1fef921065b4f0dfdd23f690 /meta/recipes-connectivity
parent9820786bbaf51fca38cf6ec90de623b8420500e1 (diff)
downloadpoky-4809890ae56f428413601072852e81f9a59ff891.tar.gz
telepathy-glib: remove pkgconfig dependency in pkgconfig
A pkg-config file depending on pkg-config doesn't really make sense, and this is causing unexpected dependencies on pkg-config at image contruction time (see (From OE-Core rev: 1024f59c78ebdec132fde6a2d7eccde4b03ba468) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch41
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib_0.19.8.bb5
2 files changed, 44 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch b/meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch
new file mode 100644
index 0000000000..8f0ac28328
--- /dev/null
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch
@@ -0,0 +1,41 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 4acc51d5b848359211bb8a00f0daa8e0bc44eb65 Mon Sep 17 00:00:00 2001
5From: Will Thompson <will.thompson@collabora.co.uk>
6Date: Mon, 10 Dec 2012 14:11:05 +0000
7Subject: Remove pkg-config dependency from .pc files
8
9This causes problems for Yocto, since they use pc files when choosing
10package dependencies. It doesn't make a huge amount of sense for a
11.pc file to depend on pkg-config: by the time you've parsed the file,
12you've got pkg-config. And the versioned dependency is checked by
13configure, as commit 1154794 (which added this) mentions, so if you've
14compiled telepathy-glib, your pkg-config is new enough.
15---
16diff --git a/telepathy-glib/telepathy-glib-uninstalled.pc.in b/telepathy-glib/telepathy-glib-uninstalled.pc.in
17index 932983c..3dbefb2 100644
18--- a/telepathy-glib/telepathy-glib-uninstalled.pc.in
19+++ b/telepathy-glib/telepathy-glib-uninstalled.pc.in
20@@ -6,7 +6,6 @@ abs_top_builddir=@abs_top_builddir@
21 Name: Telepathy-GLib (uninstalled copy)
22 Description: GLib utility library for the Telepathy framework
23 Version: @VERSION@
24-Requires: pkg-config >= 0.21
25 Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
26 Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la
27 Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
28diff --git a/telepathy-glib/telepathy-glib.pc.in b/telepathy-glib/telepathy-glib.pc.in
29index 1c5f4b6..75ac275 100644
30--- a/telepathy-glib/telepathy-glib.pc.in
31+++ b/telepathy-glib/telepathy-glib.pc.in
32@@ -6,7 +6,6 @@ includedir=@includedir@
33 Name: Telepathy-GLib
34 Description: GLib utility library for the Telepathy framework
35 Version: @VERSION@
36-Requires: pkg-config >= 0.21
37 Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
38 Libs: -L${libdir} -ltelepathy-glib
39 Cflags: -I${includedir}/telepathy-1.0
40--
41cgit v0.9.0.2-2-gbebe
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.8.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.8.bb
index 6bf27b2083..370a822370 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.8.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.8.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection man
3HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" 3HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
4DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib" 4DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
5LICENSE = "LGPLv2.1+" 5LICENSE = "LGPLv2.1+"
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz" 8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz \
9 file://pkgconfig.patch"
9 10
10SRC_URI[md5sum] = "ffd0953953981473fcd9c373ccb9e882" 11SRC_URI[md5sum] = "ffd0953953981473fcd9c373ccb9e882"
11SRC_URI[sha256sum] = "581682a937ee33bd4ce01e17d09b338155a79dff44925b988b0701fdbee50b20" 12SRC_URI[sha256sum] = "581682a937ee33bd4ce01e17d09b338155a79dff44925b988b0701fdbee50b20"