diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-02-04 09:03:56 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-02-04 10:19:32 +0100 |
| commit | 3c22e3c546a743660022656c2edf2e05d154a7ef (patch) | |
| tree | 96350ffa437ea9aca4847f089b1c051356c8ad66 | |
| parent | c9826b97618f96acd29400f536cdbe592552c4ab (diff) | |
gnome-python 2.28.0: fixes for new pygobject/pygtk combo
| -rw-r--r-- | recipes/gnome/gnome-python_2.28.0.bb | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/recipes/gnome/gnome-python_2.28.0.bb b/recipes/gnome/gnome-python_2.28.0.bb index 54523f898f..289428a0ac 100644 --- a/recipes/gnome/gnome-python_2.28.0.bb +++ b/recipes/gnome/gnome-python_2.28.0.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" DEPENDS = "libgnomeui pyorbit python-pygtk" RDEPENDS = "pyorbit" -PR = "r1" +PR = "r2" inherit gnome distutils-base pkgconfig @@ -11,12 +11,23 @@ inherit gnome distutils-base pkgconfig do_configure_prepend() { export HOST_SYS=${HOST_SYS} export BUILD_SYS=${BUILD_SYS} - sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ - -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ - -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes/\":g \ - ${S}/configure.ac + sed -i \ + -e s:'`$PKG_CONFIG --variable defsdir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`':\"${STAGING_INCDIR}/pygtk-2.0\":g \ + -e s:'`$PKG_CONFIG --variable=datadir pygobject-2.0`':\"${STAGING_DATADIR}\":g \ + -e s:'`$PKG_CONFIG --variable codegendir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \ + -e s:'`$PKG_CONFIG --variable=codegendir pygtk-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \ + -e s:'`$PKG_CONFIG --variable=fixxref pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/xsl/fixxref.py\":g \ + -e 's:PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION":PYTHON_CFLAGS="-I${STAGING_INCDIR}/python$PYTHON_VERSION":g' \ + -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes/\":g \ + ${S}/configure.ac } +EXTRA_OECONF = " ac_cv_path_PYGOBJECT_CODEGEN=${STAGING_DATADIR}/pygobject/2.0/codegen/codegen.py " + + do_stage() { autotools_stage_all } |