diff options
| -rw-r--r-- | qte/qte_2.3.7.oe | 14 | ||||
| -rw-r--r-- | qte/qte_2.3.8-snap.oe | 19 |
2 files changed, 9 insertions, 24 deletions
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe index 447c261ad3..b236458416 100644 --- a/qte/qte_2.3.7.oe +++ b/qte/qte_2.3.7.oe @@ -1,4 +1,6 @@ DESCRIPTION = "Qt/Embedded version ${PV}" +SECTION = "libs" +PRIORITY = "optional" LICENSE = "GPL/QPL" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \ file://${FILESDIR}/qpe.patch;patch=1 \ @@ -9,15 +11,6 @@ DEPENDS = "virtual/libc base/zlib base/libpng base/jpeg uicmoc-native" PROVIDES = "virtual/qte virtual/libqte2" S = "${WORKDIR}/qt-${PV}" -# strip off leading and trailing whitespace, and made the vars single word -#CXX:="${@oe.data.getVar('CXX', d, 1).strip().split()[-1]}" -#CC:="${@oe.data.getVar('CC', d, 1).strip().split()[-1]}" -#BUILD_CXX:="${@oe.data.getVar('BUILD_CXX', d, 1).strip().split()[-1]}" -#BUILD_CC:="${@oe.data.getVar('BUILD_CC', d, 1).strip().split()[-1]}" -#CFLAGS:="${@oe.data.getVar('CFLAGS', d, 1).strip()}" -#CXXFLAGS:="${@oe.data.getVar('CXXFLAGS', d, 1).strip()}" -#LDFLAGS:="${@oe.data.getVar('LDFLAGS', d, 1).strip()}" - export QTDIR = "${S}" def qte_arch(d): @@ -51,8 +44,7 @@ export SYSCONF_MOC = "${STAGING_BINDIR}/moc" export SYSCONF_UIC = "${STAGING_BINDIR}/uic" do_configure() { - oenote ./configure ${EXTRA_OECONF} - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed" + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } do_compile() { diff --git a/qte/qte_2.3.8-snap.oe b/qte/qte_2.3.8-snap.oe index bfa806ff6d..3864fd3d5a 100644 --- a/qte/qte_2.3.8-snap.oe +++ b/qte/qte_2.3.8-snap.oe @@ -1,24 +1,17 @@ SNAPDATE = "${@'%d%02d%02d' % ( time.localtime()[0], time.localtime()[1], time.localtime()[2]-1 )}" DESCRIPTION = "Qt/Embedded version ${PV}shot as of ${SNAPDATE}" LICENSE = "GPL/QPL" +SECTION = "libs" +PRIORITY = "optional" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}shot-${SNAPDATE}.tar.gz \ - file://${FILESDIR}/qpe.patch;patch=1 \ - file://${FILESDIR}/tslib.patch;patch=1 \ - file://${FILESDIR}/devfs.patch;patch=1 \ - file://${FILESDIR}/no-moc.patch;patch=1" + file://${FILESDIR}/qpe.patch;patch=1 \ + file://${FILESDIR}/tslib.patch;patch=1 \ + file://${FILESDIR}/devfs.patch;patch=1 \ + file://${FILESDIR}/no-moc.patch;patch=1" DEPENDS = "virtual/libc base/zlib base/libpng base/jpeg uicmoc-native" PROVIDES = "virtual/qte virtual/libqte2" S = "${WORKDIR}/qt-${PV}shot-${SNAPDATE}" -# strip off leading and trailing whitespace, and made the vars single word -#CXX:="${@oe.data.getVar('CXX', d, 1).strip().split()[-1]}" -#CC:="${@oe.data.getVar('CC', d, 1).strip().split()[-1]}" -#BUILD_CXX:="${@oe.data.getVar('BUILD_CXX', d, 1).strip().split()[-1]}" -#BUILD_CC:="${@oe.data.getVar('BUILD_CC', d, 1).strip().split()[-1]}" -#CFLAGS:="${@oe.data.getVar('CFLAGS', d, 1).strip()}" -#CXXFLAGS:="${@oe.data.getVar('CXXFLAGS', d, 1).strip()}" -#LDFLAGS:="${@oe.data.getVar('LDFLAGS', d, 1).strip()}" - export QTDIR = "${S}" def qte_arch(d): |