--- /dev/null
+--- /tmp/configure 2010-02-10 15:41:58.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.4.3/configure 2010-02-10 15:42:01.000000000 +0100
+@@ -3946,6 +3946,12 @@
+ [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
+ [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
+ [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
++
++# OE
++if [ x$CROSSHACK = xtrue ] ; then
++ echo "Exiting now, since we have what we want: a qmake binary"
++ exit 0
++fi
+ fi # Build qmake
+
+ #-------------------------------------------------------------------------------
+++ /dev/null
-QTVERSION="4.4.3"
-FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
-
-inherit native
-
-require ${PN}.inc
-
-do_install() {
- :
-}
-
-
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
# We call 'moc' during the build
DEPENDS = "uicmoc4-native"
inherit autotools
+CROSSHACK = "true"
+CROSSHACK_virtclass-native = ""
+CROSSHACK_virtclass-nativesdk = ""
+
+export CROSSHACK
export QTDIR = "${S}"
EXTRA_OEMAKE = "-e"
+TARGET_CC_ARCH += "${LDFLAGS}"
+
do_configure() {
+
# Make sure we regenerate all Makefiles
find ${S} -name "Makefile" | xargs rm
# Install the OE build templates
:
}
-do_stage() {
- install -d ${STAGING_BINDIR_NATIVE}
- install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
- install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake-qt4
- install -d ${STAGING_DATADIR_NATIVE}/qt4
- cp -PfR mkspecs ${STAGING_DATADIR_NATIVE}/qt4/
-}
+FILES_${PN} += "${datadir}/qt4/"
QTVERSION="4.4.3"
-require qmake2-native.inc
+FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2"
-inherit sdk
+BBCLASSEXTEND = "native sdk"
-do_install () {
- install -d ${D}/${bindir}
+require ${PN}.inc
+
+SRC_URI += "file://qmake-hack.diff;patch=1"
+
+do_install() {
+ install -d ${D}/${bindir}
install -m 0755 bin/qmake ${D}/${bindir}/qmake2
install -m 0755 bin/qmake ${D}/${bindir}/qmake-qt4
install -d ${D}/${datadir}/qt4
}
-
-
-