diff options
| author | Gary Thomas <gary@mlbassoc.com> | 2014-11-05 07:57:38 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-09 10:17:06 +0000 |
| commit | 02985d315f71126d3af789b0666dbf428f586e4b (patch) | |
| tree | 598d65b65686e17358a26c3c4e894bd0804c1a67 /meta/recipes-devtools | |
| parent | 0870d9115546ad3b456af52ed45e46e637874a48 (diff) | |
| download | openembedded-core-02985d315f71126d3af789b0666dbf428f586e4b.tar.gz openembedded-core-02985d315f71126d3af789b0666dbf428f586e4b.tar.bz2 openembedded-core-02985d315f71126d3af789b0666dbf428f586e4b.zip | |
python-pygtk: Clean up incorrect "fix"
This patch removes most of "dirty fix #1" which is no longer needed
(no dependency on python-pygobject-dev exists). A side effect is
that the pygtk code generator will also be installed.
Merge 'fix-path.inc' into this recipe as it is not used by any other
recipe.
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/python/fix-path.inc | 22 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-pygtk_2.24.0.bb | 27 |
2 files changed, 21 insertions, 28 deletions
diff --git a/meta/recipes-devtools/python/fix-path.inc b/meta/recipes-devtools/python/fix-path.inc deleted file mode 100644 index 0738c59ada..0000000000 --- a/meta/recipes-devtools/python/fix-path.inc +++ /dev/null @@ -1,22 +0,0 @@ -do_install_append() { - for i in `find ${D} -name "*.py"` ; do \ - sed -i -e s:${D}::g $i - done - - for i in `find ${D} -name "*.la"` ; do \ - sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i - done - - if test -e ${D}${bindir} ; then - for i in ${D}${bindir}/* ; do \ - sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i - done - fi - - if test -e ${D}${sbindir} ; then - for i in ${D}${sbindir}/* ; do \ - sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i - done - fi -} - 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 bd26ebb7da..053f37fcbe 100644 --- a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb +++ b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb @@ -40,16 +40,31 @@ do_configure_prepend() { sed -i 's:tests docs:tests:' ${S}/Makefile.am } -# dirty fix #1: remove dependency on python-pygobject-dev +# dirty fix #2: fix build system paths leaking in do_install_append() { - find ${D} -name "*.la"|xargs rm -f - rm -f ${D}/${bindir}/pygtk-codegen-2.0 + for i in `find ${D} -name "*.py"` ; do \ + sed -i -e s:${D}::g $i + done + + for i in `find ${D} -name "*.la"` ; do \ + sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i + done + + if test -e ${D}${bindir} ; then + for i in ${D}${bindir}/* ; do \ + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i + done + fi + + if test -e ${D}${sbindir} ; then + for i in ${D}${sbindir}/* ; do \ + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i + done + fi + sed -i -e '1s|^#!.*python|#!/usr/bin/env python|' ${D}${bindir}/pygtk-demo } -# dirty fix #2: fix build system paths leaking in -require fix-path.inc - PACKAGES =+ "${PN}-demo" FILES_${PN}-demo = " ${bindir}/pygtk-demo ${libdir}/pygtk " RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang" |