diff options
| -rw-r--r-- | classes/distutils-base.bbclass | 14 | ||||
| -rw-r--r-- | packages/python/python-pyqt_3.13.bb | 4 | ||||
| -rw-r--r-- | packages/python/python-pyqwt_3.10.bb | 4 | ||||
| -rw-r--r-- | packages/python/python-sip_4.1.1.bb | 4 |
4 files changed, 20 insertions, 6 deletions
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index e69de29bb2..68d7112166 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -0,0 +1,14 @@ +EXTRA_OEMAKE = "" +DEPENDS += "${@["python-native python", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" +RDEPENDS += "python-core" + +def python_dir(d): + import os, bb + staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) + if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3" + if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4" + raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" + +PYTHON_DIR = "${@python_dir(d)}" +FILES_${PN} = "${bindir} ${libdir} ${libdir}/${PYTHON_DIR}" + diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index b264f67f72..633a0e5cdd 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -7,13 +7,13 @@ LICENSE = "GPL" RDEPENDS = "python-core python-sip" DEPENDS = "virtual/libqte2 virtual/libqpe" SRCNAME = "pyqt" -PR = "ml1" +PR = "ml2" SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ file://features" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit qmake sip +inherit qmake sip distutils-base QMAKE_PROFILES = "pyqt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb index cf8543f6c8..7b3c8ab28f 100644 --- a/packages/python/python-pyqwt_3.10.bb +++ b/packages/python/python-pyqwt_3.10.bb @@ -7,14 +7,14 @@ LICENSE = "GPL" RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt" DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt" SRCNAME = "pyqwt" -PR = "ml2" +PR = "ml3" SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ file://qt2.x-compat.patch;patch=1 \ file://features" S = "${WORKDIR}/PyQwt-20040118" -inherit qmake sip +inherit qmake sip distutils-base QMAKE_PROFILES = "pyqwt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" diff --git a/packages/python/python-sip_4.1.1.bb b/packages/python/python-sip_4.1.1.bb index 071e155276..cc600c691c 100644 --- a/packages/python/python-sip_4.1.1.bb +++ b/packages/python/python-sip_4.1.1.bb @@ -5,12 +5,12 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" DEPENDS = "virtual/libqte2 python" RDEPENDS = "python-core" -PR = "ml1" +PR = "ml3" SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" S = "${WORKDIR}/sip-${PV}/siplib" -inherit qmake +inherit qmake distutils-base EXTRA_QMAKEVARS_POST = " TEMPLATE=lib \ CONFIG=qt \ |