diff options
| author | Marcin Juszkiewicz <hrw@koansoftware.com> | 2009-03-26 11:10:03 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@koansoftware.com> | 2009-03-26 11:10:03 +0100 |
| commit | a7be854977d7ad7c8460fee76739db8154e83049 (patch) | |
| tree | 3696192bc8abcae8ce4e0121df2dd4e5246541df /recipes/python | |
| parent | e2718269c5f56774705478545316a879f0be82c4 (diff) | |
| parent | 1b045e71ce7c3b7ed6c68ae1d60e974edbe38efc (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/python')
| -rw-r--r-- | recipes/python/python-pyqt_4.4.3.bb | 14 | ||||
| -rw-r--r-- | recipes/python/python-pyrex_0.9.8.5.bb | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/recipes/python/python-pyqt_4.4.3.bb b/recipes/python/python-pyqt_4.4.3.bb index 08a8fc6683..8033bc5e7d 100644 --- a/recipes/python/python-pyqt_4.4.3.bb +++ b/recipes/python/python-pyqt_4.4.3.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "sip-native python-sip" RDEPENDS = "python-core" SRCNAME = "pyqt" -PR = "ml4" +PR = "ml5" PYQT_OE_VERSION = "Qt_4_4_1" @@ -16,13 +16,21 @@ SRC_URI = "\ file://cross-compile.patch;patch=1 \ file://01_configure.dpatch;patch=1 \ file://02_htmllinks.dpatch;patch=1 \ - file://03_qreal.dpatch;patch=1 \ - file://04_qreal_api_fixes-for-4.4.3.dpatch;patch=1 \ \ file://assistantclient-fix.patch;patch=1 \ " S = "${WORKDIR}/PyQt-x11-gpl-${PV}" +# arm and mips machines need some extra patches + +SRC_URI_append_arm = "\ + file://03_qreal.dpatch;patch=1 \ + file://04_qreal_api_fixes-for-4.4.3.dpatch;patch=1" + +SRC_URI_append_mipsel = "\ + file://03_qreal.dpatch;patch=1 \ + file://04_qreal_api_fixes-for-4.4.3.dpatch;patch=1" + inherit qt4x11 sip distutils-base PARALLEL_MAKE = "" diff --git a/recipes/python/python-pyrex_0.9.8.5.bb b/recipes/python/python-pyrex_0.9.8.5.bb index 94db79341e..03468a0522 100644 --- a/recipes/python/python-pyrex_0.9.8.5.bb +++ b/recipes/python/python-pyrex_0.9.8.5.bb @@ -5,10 +5,10 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" SRCNAME = "Pyrex" -PR = "ml0" +PR = "ml1" SRC_URI = "\ - http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ + http://www.cosc.canterbury.ac.nz/greg.ewing/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ file://pyrex-fix-optimized-mode.patch;patch=1 \ " S = "${WORKDIR}/${SRCNAME}-${PV}" |