summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2014-11-05 07:57:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-09 10:21:24 +0000
commit77d62cca2723c85bed0a6ac936948bceb81e9f11 (patch)
tree307be522bf5eb446843d4105d4de8a24c8d51fa0 /meta
parentfb4d7ece3b5e67bcab133e8d6f17d2257d04049e (diff)
downloadpoky-77d62cca2723c85bed0a6ac936948bceb81e9f11.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/fix-path.inc22
-rw-r--r--meta/recipes-devtools/python/python-pygtk_2.24.0.bb27
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 @@
1do_install_append() {
2 for i in `find ${D} -name "*.py"` ; do \
3 sed -i -e s:${D}::g $i
4 done
5
6 for i in `find ${D} -name "*.la"` ; do \
7 sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
8 done
9
10 if test -e ${D}${bindir} ; then
11 for i in ${D}${bindir}/* ; do \
12 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
13 done
14 fi
15
16 if test -e ${D}${sbindir} ; then
17 for i in ${D}${sbindir}/* ; do \
18 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
19 done
20 fi
21}
22
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() {
40 sed -i 's:tests docs:tests:' ${S}/Makefile.am 40 sed -i 's:tests docs:tests:' ${S}/Makefile.am
41} 41}
42 42
43# dirty fix #1: remove dependency on python-pygobject-dev 43# dirty fix #2: fix build system paths leaking in
44do_install_append() { 44do_install_append() {
45 find ${D} -name "*.la"|xargs rm -f 45 for i in `find ${D} -name "*.py"` ; do \
46 rm -f ${D}/${bindir}/pygtk-codegen-2.0 46 sed -i -e s:${D}::g $i
47 done
48
49 for i in `find ${D} -name "*.la"` ; do \
50 sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
51 done
52
53 if test -e ${D}${bindir} ; then
54 for i in ${D}${bindir}/* ; do \
55 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
56 done
57 fi
58
59 if test -e ${D}${sbindir} ; then
60 for i in ${D}${sbindir}/* ; do \
61 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
62 done
63 fi
64
47 sed -i -e '1s|^#!.*python|#!/usr/bin/env python|' ${D}${bindir}/pygtk-demo 65 sed -i -e '1s|^#!.*python|#!/usr/bin/env python|' ${D}${bindir}/pygtk-demo
48} 66}
49 67
50# dirty fix #2: fix build system paths leaking in
51require fix-path.inc
52
53PACKAGES =+ "${PN}-demo" 68PACKAGES =+ "${PN}-demo"
54FILES_${PN}-demo = " ${bindir}/pygtk-demo ${libdir}/pygtk " 69FILES_${PN}-demo = " ${bindir}/pygtk-demo ${libdir}/pygtk "
55RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang" 70RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang"