diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-03-23 11:28:06 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-03-23 11:28:57 +0100 |
| commit | def27576cc1c2f0336358a4965d421323d6b86fe (patch) | |
| tree | edc8132ffd85bbac2a1cd1d8f77995c53dee6021 | |
| parent | c6ec2dffc03f0aed54a17c77d3e83eba3abb88da (diff) | |
qmake2: don't install specs, those are packaged by the qt4 recipe. Ship env setup scripts
| -rw-r--r-- | recipes/qmake/qmake2.inc | 2 | ||||
| -rw-r--r-- | recipes/qmake/qmake2_2.10a.bb | 37 |
2 files changed, 37 insertions, 2 deletions
diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc index 6924d1f5ec..9f3de244bb 100644 --- a/recipes/qmake/qmake2.inc +++ b/recipes/qmake/qmake2.inc @@ -3,7 +3,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL" -PR = "r8" +PR = "r9" # We call 'moc' during the build DEPENDS = "uicmoc4-native" diff --git a/recipes/qmake/qmake2_2.10a.bb b/recipes/qmake/qmake2_2.10a.bb index abf4380b7c..54b5815bb3 100644 --- a/recipes/qmake/qmake2_2.10a.bb +++ b/recipes/qmake/qmake2_2.10a.bb @@ -12,7 +12,42 @@ do_install() { install -m 0755 bin/qmake ${D}/${bindir}/qmake2 install -m 0755 bin/qmake ${D}/${bindir}/qmake-qt4 install -d ${D}/${datadir}/qt4 - cp -PfR mkspecs ${D}/${datadir}/qt4/ + install -d ${D}/${datadir}/qtopia + + script="${D}/${datadir}/qtopia/environment-setup" + touch $script + echo 'export OE_QMAKE_CC=gcc' >> $script + echo 'export OE_QMAKE_CXX=g++' >> $script + echo 'export OE_QMAKE_LINK=g++' >> $script + echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script + echo 'export OE_QMAKE_INCDIR_QT=${includedir}/qtopia' >> $script + echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script + echo 'export OE_QMAKE_UIC=${bindir}/uic' >> $script + echo 'export OE_QMAKE_UIC3=${bindir}/uic3' >> $script + echo 'export OE_QMAKE_RCC=${bindir}/rcc' >> $script + echo 'export OE_QMAKE_QDBUSCPP2XML=${bindir}/qdbuscpp2xml' >> $script + echo 'export OE_QMAKE_QDBUSXML2CPP=${bindir}/qdbusxml2cpp' >> $script + echo 'export OE_QMAKE_QT_CONFIG=${datadir}/qtopia/mkspecs/qconfig.pri' >> $script + echo 'export QMAKESPEC=${datadir}/qtopia/mkspecs/linux-g++' >> $script + + script="${D}/${datadir}/qt4/environment-setup" + touch $script + echo 'export OE_QMAKE_CC=gcc' >> $script + echo 'export OE_QMAKE_CXX=g++' >> $script + echo 'export OE_QMAKE_LINK=g++' >> $script + echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script + echo 'export OE_QMAKE_INCDIR_QT=${includedir}/qt4' >> $script + echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script + echo 'export OE_QMAKE_UIC=${bindir}/uic' >> $script + echo 'export OE_QMAKE_UIC3=${bindir}/uic3' >> $script + echo 'export OE_QMAKE_RCC=${bindir}/rcc' >> $script + echo 'export OE_QMAKE_QDBUSCPP2XML=${bindir}/qdbuscpp2xml' >> $script + echo 'export OE_QMAKE_QDBUSXML2CPP=${bindir}/qdbusxml2cpp' >> $script + echo 'export OE_QMAKE_QT_CONFIG=${datadir}/qt4/mkspecs/qconfig.pri' >> $script + echo 'export QMAKESPEC=${datadir}/qt4/mkspecs/linux-g++' >> $script + + chmod 0755 ${D}${datadir}/qt*/environment-setup } +FILES_${PN} += "${datadir}/qt*/environment-setup" |