diff options
| -rw-r--r-- | qte/qte-2.3.6-r0/no-moc.patch | 0 | ||||
| -rw-r--r-- | qte/qte-2.3.7-r0/no-moc.patch | 0 | ||||
| -rw-r--r-- | qte/qte_2.3.6.oe | 14 | ||||
| -rw-r--r-- | qte/qte_2.3.7.oe | 14 | ||||
| -rw-r--r-- | qte/qte_2.3.8-snap.oe | 66 |
5 files changed, 74 insertions, 20 deletions
diff --git a/qte/qte-2.3.6-r0/no-moc.patch b/qte/qte-2.3.6-r0/no-moc.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/qte/qte-2.3.6-r0/no-moc.patch diff --git a/qte/qte-2.3.7-r0/no-moc.patch b/qte/qte-2.3.7-r0/no-moc.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/qte/qte-2.3.7-r0/no-moc.patch diff --git a/qte/qte_2.3.6.oe b/qte/qte_2.3.6.oe index 606e4ced1e..815622e6a6 100644 --- a/qte/qte_2.3.6.oe +++ b/qte/qte_2.3.6.oe @@ -3,7 +3,8 @@ LICENSE="GPL/QPL" SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \ file://${FILESDIR}/qpe.patch;patch=1 \ file://${FILESDIR}/tslib.patch;patch=1 \ - file://${FILESDIR}/devfs.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 PROVIDES=virtual/qte virtual/libqte2 S="${WORKDIR}/qt-${PV}" @@ -37,6 +38,8 @@ export SYSCONF_SHLIB = ${CCLD} export SYSCONF_CFLAGS = ${CFLAGS} export SYSCONF_CXXFLAGS = ${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG export SYSCONF_LFLAGS = ${LDFLAGS} +export SYSCONF_MOC = ${STAGING_BINDIR}/moc +export SYSCONF_UIC = ${STAGING_BINDIR}/uic do_configure() { if [ "$BUILD_ARCH" = "i686" ]; then @@ -47,15 +50,6 @@ do_configure() { do_compile() { unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS - ( - cd src/moc - export SYSCONF_CXX="${BUILD_CXX}" - export SYSCONF_CC="${BUILD_CC}" - export SYSCONF_LINK="${BUILD_CCLD}" - export SYSCONF_SHLIB="${BUILD_CC}" - unset SYSCONF_CFLAGS SYSCONF_CXXFLAGS SYSCONF_LFLAGS - oe_runmake - ) || die "Building moc failed" oe_runmake } diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe index 606e4ced1e..815622e6a6 100644 --- a/qte/qte_2.3.7.oe +++ b/qte/qte_2.3.7.oe @@ -3,7 +3,8 @@ LICENSE="GPL/QPL" SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \ file://${FILESDIR}/qpe.patch;patch=1 \ file://${FILESDIR}/tslib.patch;patch=1 \ - file://${FILESDIR}/devfs.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 PROVIDES=virtual/qte virtual/libqte2 S="${WORKDIR}/qt-${PV}" @@ -37,6 +38,8 @@ export SYSCONF_SHLIB = ${CCLD} export SYSCONF_CFLAGS = ${CFLAGS} export SYSCONF_CXXFLAGS = ${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG export SYSCONF_LFLAGS = ${LDFLAGS} +export SYSCONF_MOC = ${STAGING_BINDIR}/moc +export SYSCONF_UIC = ${STAGING_BINDIR}/uic do_configure() { if [ "$BUILD_ARCH" = "i686" ]; then @@ -47,15 +50,6 @@ do_configure() { do_compile() { unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS - ( - cd src/moc - export SYSCONF_CXX="${BUILD_CXX}" - export SYSCONF_CC="${BUILD_CC}" - export SYSCONF_LINK="${BUILD_CCLD}" - export SYSCONF_SHLIB="${BUILD_CC}" - unset SYSCONF_CFLAGS SYSCONF_CXXFLAGS SYSCONF_LFLAGS - oe_runmake - ) || die "Building moc failed" oe_runmake } diff --git a/qte/qte_2.3.8-snap.oe b/qte/qte_2.3.8-snap.oe index e69de29bb2..60525fc87a 100644 --- a/qte/qte_2.3.8-snap.oe +++ b/qte/qte_2.3.8-snap.oe @@ -0,0 +1,66 @@ +SNAPDATE=20040107 +DESCRIPTION="Qt/Embedded version ${PV}shot as of ${SNAPDATE}" +LICENSE="GPL/QPL" +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" +DEPENDS=virtual/libc base/zlib base/libpng base/jpeg +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} + +ARCH_i686=x86 + +EXTRA_OECONF=-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif ${EXTRA_OECONF_ARCH} ${EXTRA_OECONF_CONFIG} + +EXTRA_OECONF_CONFIG=-qconfig qpe +EXTRA_OECONF_ARCH=-xplatform ${TARGET_OS}-${TARGET_ARCH}-g++ +EXTRA_OECONF_ARCH_collie=-xplatform ${TARGET_OS}-sharp-g++ +EXTRA_OECONF_ARCH_ramses=-xplatform ${TARGET_OS}-ramses-g++ + +EXTRA_OEMAKE=-e + +export SYSCONF_CC = ${CC} +export SYSCONF_CXX = ${CXX} +export SYSCONF_LINK = ${CCLD} +export SYSCONF_SHLIB = ${CCLD} +export SYSCONF_CFLAGS = ${CFLAGS} +export SYSCONF_CXXFLAGS = ${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG +export SYSCONF_LFLAGS = ${LDFLAGS} +export SYSCONF_MOC = ${STAGING_BINDIR}/moc +export SYSCONF_UIC = ${STAGING_BINDIR}/uic + +do_configure() { + if [ "$BUILD_ARCH" = "i686" ]; then + BUILD_ARCH=x86 + fi + echo yes | ./configure -platform $BUILD_OS-$BUILD_ARCH-g++ $EXTRA_OECONF || die "Configuring qt failed" +} + +do_compile() { + unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS + oe_runmake || die "Compiling qte failed" +} + +do_stage () { + install -m 0755 lib/libqte.so.* ${STAGING_LIBDIR}/ + rm -f include/qxt.h + cp -a include/* ${STAGING_DIR}/target/include/ +} + +do_install () { + install -d ${D}/usr/lib/qte2/lib + install -m 0755 lib/libqte.so.* ${D}/usr/lib/qte2/lib/ +} |