sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: 02985d315f71126d3af789b0666dbf428f586e4b)

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>
This commit is contained in:
Gary Thomas 2014-11-05 07:57:38 -07:00 committed by Richard Purdie
parent fb4d7ece3b
commit 77d62cca27
2 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-devtools/python/fix-path.inc
View File

@ -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
}

27
meta/recipes-devtools/python/python-pygtk_2.24.0.bb
View File

@ -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"