summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2014-10-28 09:05:47 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-04 10:27:12 +0000
commit8e146975a35ab2fcc9b8f9084a6ecbd493c4a222 (patch)
treecf290d56007b76a598233d73398956fb4b35d00c
parent69dd116eb957c964a539e71513f7f18f8ed5cff0 (diff)
downloadpoky-8e146975a35ab2fcc9b8f9084a6ecbd493c4a222.tar.gz
python-pygtk: Restore pkg-config file
Some previous version of this recipe was errantly removing the pygtk-2.0.pc (pkg-config) file. This is needed for other packages to be able to build against this library. Also update the .pc file to match current pkg-config use (libdir was missing). (From OE-Core rev: 8c6158d7bcca2ecf3e150d1e8eaaaa4ece58e1e2) Signed-off-by: Gary Thomas <gary@mlbassoc.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch13
-rw-r--r--meta/recipes-devtools/python/python-pygtk_2.24.0.bb2
2 files changed, 14 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch b/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch
new file mode 100644
index 0000000000..b6156540bd
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch
@@ -0,0 +1,13 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: pygtk-2.24.0/pygtk-2.0.pc.in
4===================================================================
5--- pygtk-2.24.0.orig/pygtk-2.0.pc.in
6+++ pygtk-2.24.0/pygtk-2.0.pc.in
7@@ -1,5 +1,6 @@
8 prefix=@prefix@
9 exec_prefix=@exec_prefix@
10+libdir=@libdir@
11 includedir=@includedir@
12 datarootdir=@datarootdir@
13 datadir=@datadir@
diff --git a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
index 8fc194f5e6..bd26ebb7da 100644
--- a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
+++ b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
@@ -15,6 +15,7 @@ SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar
15 file://fix-gtkunixprint.patch \ 15 file://fix-gtkunixprint.patch \
16 file://prevent_to_get_display_during_import.patch \ 16 file://prevent_to_get_display_during_import.patch \
17 file://nodocs.patch \ 17 file://nodocs.patch \
18 file://fix-pygtk-2.0.pc.patch \
18 file://acinclude.m4 \ 19 file://acinclude.m4 \
19 file://update-dependences-of-defs.c.patch" 20 file://update-dependences-of-defs.c.patch"
20 21
@@ -43,7 +44,6 @@ do_configure_prepend() {
43do_install_append() { 44do_install_append() {
44 find ${D} -name "*.la"|xargs rm -f 45 find ${D} -name "*.la"|xargs rm -f
45 rm -f ${D}/${bindir}/pygtk-codegen-2.0 46 rm -f ${D}/${bindir}/pygtk-codegen-2.0
46 rm -rf ${D}/${libdir}/pkgconfig
47 sed -i -e '1s|^#!.*python|#!/usr/bin/env python|' ${D}${bindir}/pygtk-demo 47 sed -i -e '1s|^#!.*python|#!/usr/bin/env python|' ${D}${bindir}/pygtk-demo
48} 48}
49 49