diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-11-29 11:34:04 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-11-29 11:34:04 +0000 |
| commit | 081432e434818a616a523f9f2bb18e707e4e68e3 (patch) | |
| tree | 66e473e317db4a0f1056c474b26fdefde6e6ec6e /packages/python | |
| parent | 12bb4c41c375d36b596ba4eb0a9c8ce1d6ace10e (diff) | |
Introduce STAGING_BINDIR_CROSS and STAGING_BINDIR_NATIVE as discussed on the mailing list. There should be no functionality changes yet.
Diffstat (limited to 'packages/python')
| -rw-r--r-- | packages/python/python-pygtk2_2.10.3.bb | 2 | ||||
| -rw-r--r-- | packages/python/python-pygtk2_2.8.6.bb | 2 | ||||
| -rw-r--r-- | packages/python/python-pyqt4_4.0.bb | 4 | ||||
| -rw-r--r-- | packages/python/python-pyqt_3.13.bb | 4 | ||||
| -rw-r--r-- | packages/python/python_2.4.3.bb | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb index e6d1ae2438..d040299a0e 100644 --- a/packages/python/python-pygtk2_2.10.3.bb +++ b/packages/python/python-pygtk2_2.10.3.bb @@ -23,7 +23,7 @@ do_configure_prepend() { do_stage() { autotools_stage_includes sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0 - install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/ + install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/ install -d ${STAGING_DATADIR}/pygtk/2.0/codegen install -d ${STAGING_DATADIR}/pygtk/2.0/defs/ cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/ diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk2_2.8.6.bb index d1f65ea3ce..ab571bdfd9 100644 --- a/packages/python/python-pygtk2_2.8.6.bb +++ b/packages/python/python-pygtk2_2.8.6.bb @@ -19,5 +19,5 @@ do_configure_prepend() { do_stage() { autotools_stage_includes - install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/ + install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/ } diff --git a/packages/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.0.bb index fad858d203..64a9a71f68 100644 --- a/packages/python/python-pyqt4_4.0.bb +++ b/packages/python/python-pyqt4_4.0.bb @@ -25,8 +25,8 @@ SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR}" -#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \ -# QMAKE_MOC=${STAGING_BINDIR}/moc \ +#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \ +# QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc \ # QMAKE_RPATH=-Wl,-rpath-link, \ # DESTDIR= \ # VERSION=1.0.0 \ diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index 5e5f0b7256..00d8f32fe3 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -22,8 +22,8 @@ SIP_MODULES = "qt qtcanvas qttable qtpe" SIP_FEATURES = "${WORKDIR}/features" EXTRA_OEMAKE = " MAKEFLAGS= " -EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \ - QMAKE_MOC=${STAGING_BINDIR}/moc \ +EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \ + QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc \ QMAKE_RPATH=-Wl,-rpath-link, \ DESTDIR= \ VERSION=1.0.0 \ diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 44732d933a..dfa828bcd9 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -39,8 +39,8 @@ do_compile_prepend() { } do_compile() { - oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \ - HOSTPYTHON=${STAGING_BINDIR}/python \ + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ STAGING_LIBDIR=${STAGING_LIBDIR} \ STAGING_INCDIR=${STAGING_INCDIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ @@ -54,8 +54,8 @@ do_stage() { do_install() { install -m 0644 Makefile.orig Makefile - oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \ - HOSTPYTHON=${STAGING_BINDIR}/python \ + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ STAGING_LIBDIR=${STAGING_LIBDIR} \ STAGING_INCDIR=${STAGING_INCDIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ |