summaryrefslogtreecommitdiff
path: root/packages/python
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-04-25 17:28:26 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-25 17:28:26 +0000
commitff1696f37fcd0e1fce5c0332bf9c92239189989d (patch)
treef50fd5cdbf90793f64fe19a1939e70c5f6175a79 /packages/python
parent56b62dcfb3e0b64ea9528fd3e11107df45b4fe66 (diff)
python-pyqt: inherit palmtop to use the qte/qte-mt logic and to remove duplicated stuff
Diffstat (limited to 'packages/python')
-rw-r--r--packages/python/python-pyqt_3.13.bb22
1 files changed, 12 insertions, 10 deletions
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb
index 76562a8f07..72efea077c 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python-pyqt_3.13.bb
@@ -5,17 +5,17 @@ SECTION = "devel/python"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-RDEPENDS = "python-core python-sip"
DEPENDS = "virtual/libqte2 virtual/libqpe1"
+RDEPENDS = "python-core python-sip"
SRCNAME = "pyqt"
-PR = "ml3"
+PR = "ml4"
SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
file://qt2-fix.patch;patch=1 \
file://features"
S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
-inherit qmake sip distutils-base
+inherit palmtop sip distutils-base
QMAKE_PROFILES = "pyqt.pro"
EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
@@ -23,15 +23,17 @@ 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 QMAKE_RPATH=-Wl,-rpath-link, \
- CONFIG=qt CONFIG+=warn_on CONFIG+=release \
- DESTDIR= VERSION=1.0.0 \
- DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=QWS \
- INCLUDEPATH=. \
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \
+ QMAKE_MOC=${STAGING_BINDIR}/moc \
+ QMAKE_RPATH=-Wl,-rpath-link, \
+ DESTDIR= \
+ VERSION=1.0.0 \
+ DEFINES+=SIP_MAKE_DLL \
+ DEFINES+=SIP_QT_SUPPORT \
+ INCLUDEPATH+=. \
INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
INCLUDEPATH+=${STAGING_INCDIR} \
- LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages \
- LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe "
+ LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages"
do_configure_prepend() {
echo -e "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro