summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorGerald Britton <gbritton@doomcom.org>2004-05-12 03:40:53 +0000
committerGerald Britton <gbritton@doomcom.org>2004-05-12 03:40:53 +0000
commitd939f08ee4c97d90c5df6abb4f1952e60c928d9e (patch)
tree52f4bb0ebce562c8a440885f3a3147ddfa353b86 /python
parent7439e4d76e8e9d1941cdf8f821cbe9622df1976e (diff)
Changes for new qmake.oeclass
- uicmoc-native,uicmoc3-native: use the qmake-base.oeclass to get just vars and use those to generate appropriate qt config for build. - qmake-native: updates for the new qmake.oeclass - misc others: comment noting availability of new oeclass BKrev: 40a19cc5EKcFkTs6PkSDRpLd_cuwwg
Diffstat (limited to 'python')
-rw-r--r--python/python-pyqt_3.11.oe7
-rw-r--r--python/python-pyqwt_3.10.oe7
2 files changed, 11 insertions, 3 deletions
diff --git a/python/python-pyqt_3.11.oe b/python/python-pyqt_3.11.oe
index 1c69dec5bb..e7373d9696 100644
--- a/python/python-pyqt_3.11.oe
+++ b/python/python-pyqt_3.11.oe
@@ -11,7 +11,10 @@ SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz"
S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
-inherit qmake
+#
+# FIXME - This should be updated to use OE's qmake-base.oeclass
+# or the full qmake.oeclass.
+#
export QTDIR = "${STAGING_LIBDIR}/.."
@@ -28,7 +31,7 @@ EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN
PYTHON = "${STAGING_BINDIR}/python"
SIP = "${STAGING_BINDIR}/sip"
QMAKE = "${STAGING_BINDIR}/qmake"
-QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++"
+QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++"
MODULES = "qt qtcanvas qttable qtpe"
diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index f75ab692f2..3cad604a7d 100644
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -12,6 +12,11 @@ SRC_URI = "http://pyqwt.sourceforge.net/snapshot/PyQwt-20040118.tar.gz \
file://${FILESDIR}/qtmod-sip-staging.patch;patch=1"
S = "${WORKDIR}/PyQwt-20040118"
+#
+# FIXME - This should be updated to use OE's qmake-base.oeclass
+# or the full qmake.oeclass.
+#
+
export QTDIR = "${STAGING_LIBDIR}/.."
EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
@@ -27,7 +32,7 @@ EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN
PYTHON = "${STAGING_BINDIR}/python"
SIP = "${STAGING_BINDIR}/sip"
QMAKE = "${STAGING_BINDIR}/qmake"
-QMAKESPEC = "${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-oe-g++"
+QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++"
MODULES = "qwt"