diff options
| author |   Gary Thomas <gary@mlbassoc.com> | 2014-10-28 09:05:47 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-04 10:20:34 +0000 |
| commit | 8c6158d7bcca2ecf3e150d1e8eaaaa4ece58e1e2 (patch) | |
| tree | 8a87785378bbcd53ed9b158bfda028c4f4f7054f | |
| parent | 21fb6bc1b030cab14e2c9b14607b34a62262ac06 (diff) | |
| download | openembedded-core-contrib-8c6158d7bcca2ecf3e150d1e8eaaaa4ece58e1e2.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).
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-pygtk_2.24.0.bb | 2 |
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 @@ +Upstream-Status: Inappropriate [configuration] + +Index: pygtk-2.24.0/pygtk-2.0.pc.in +=================================================================== +--- pygtk-2.24.0.orig/pygtk-2.0.pc.in ++++ pygtk-2.24.0/pygtk-2.0.pc.in +@@ -1,5 +1,6 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ ++libdir=@libdir@ + includedir=@includedir@ + datarootdir=@datarootdir@ + 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 file://fix-gtkunixprint.patch \ file://prevent_to_get_display_during_import.patch \ file://nodocs.patch \ + file://fix-pygtk-2.0.pc.patch \ file://acinclude.m4 \ file://update-dependences-of-defs.c.patch" @@ -43,7 +44,6 @@ do_configure_prepend() { do_install_append() { find ${D} -name "*.la"|xargs rm -f rm -f ${D}/${bindir}/pygtk-codegen-2.0 - rm -rf ${D}/${libdir}/pkgconfig sed -i -e '1s|^#!.*python|#!/usr/bin/env python|' ${D}${bindir}/pygtk-demo } |