diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-12-10 15:23:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 14:28:40 +0000 |
| commit | 1024f59c78ebdec132fde6a2d7eccde4b03ba468 (patch) | |
| tree | 879491fdef2c550badddfc9c6372be079dae826b /meta/recipes-connectivity/telepathy/telepathy-glib | |
| parent | 9867a9ad7a80a26654326650752dbbe89c8de3c5 (diff) | |
| download | openembedded-core-1024f59c78ebdec132fde6a2d7eccde4b03ba468.tar.gz openembedded-core-1024f59c78ebdec132fde6a2d7eccde4b03ba468.tar.bz2 openembedded-core-1024f59c78ebdec132fde6a2d7eccde4b03ba468.zip | |
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
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/telepathy/telepathy-glib')
| -rw-r--r-- | meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch | 41 |
1 files changed, 41 insertions, 0 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 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 4acc51d5b848359211bb8a00f0daa8e0bc44eb65 Mon Sep 17 00:00:00 2001 +From: Will Thompson <will.thompson@collabora.co.uk> +Date: Mon, 10 Dec 2012 14:11:05 +0000 +Subject: Remove pkg-config dependency from .pc files + +This causes problems for Yocto, since they use pc files when choosing +package dependencies. It doesn't make a huge amount of sense for a +.pc file to depend on pkg-config: by the time you've parsed the file, +you've got pkg-config. And the versioned dependency is checked by +configure, as commit 1154794 (which added this) mentions, so if you've +compiled telepathy-glib, your pkg-config is new enough. +--- +diff --git a/telepathy-glib/telepathy-glib-uninstalled.pc.in b/telepathy-glib/telepathy-glib-uninstalled.pc.in +index 932983c..3dbefb2 100644 +--- a/telepathy-glib/telepathy-glib-uninstalled.pc.in ++++ b/telepathy-glib/telepathy-glib-uninstalled.pc.in +@@ -6,7 +6,6 @@ abs_top_builddir=@abs_top_builddir@ + Name: Telepathy-GLib (uninstalled copy) + Description: GLib utility library for the Telepathy framework + Version: @VERSION@ +-Requires: pkg-config >= 0.21 + 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 + Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la + Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} +diff --git a/telepathy-glib/telepathy-glib.pc.in b/telepathy-glib/telepathy-glib.pc.in +index 1c5f4b6..75ac275 100644 +--- a/telepathy-glib/telepathy-glib.pc.in ++++ b/telepathy-glib/telepathy-glib.pc.in +@@ -6,7 +6,6 @@ includedir=@includedir@ + Name: Telepathy-GLib + Description: GLib utility library for the Telepathy framework + Version: @VERSION@ +-Requires: pkg-config >= 0.21 + 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 + Libs: -L${libdir} -ltelepathy-glib + Cflags: -I${includedir}/telepathy-1.0 +-- +cgit v0.9.0.2-2-gbebe |