| Submitter | Paul Eggleton |
|---|---|
| Date | Feb. 26, 2012, 10:17 p.m. |
| Message ID | <cover.1330294151.git.paul.eggleton@linux.intel.com> |
| Download | mbox |
| Permalink | /patch/22097/ |
| State | Not Applicable |
| Headers | show |
Pull-request
git://git.openembedded.org/openembedded-core-contrib paule/qmake-targetComments
oops, wrong list... sorry for the noise, will resend. Cheers, Paul On Sunday 26 February 2012 22:17:57 Paul Eggleton wrote: > This patchset enables building qmake for the target with other target > utilities. I also fixed a couple of build failures in the process. > > In addition I've used the same method to build qmake in the > qt4-tools-nativesdk recipe. This wasn't strictly necessary, however I > think it would be good to be consistent and incidentally the resulting > qmake executable is slightly smaller. > > Since the RFC version, a few issues were fixed: > * Ensure the qmake changes work when the platform is different e.g. > linux-gnueabi-oe-g++ instead of linux-oe-g++ > * Install an appropriate environment setup script adapted from the > former separate qmake2 recipe > * Fix the gcc 4.6 error by fixing the root cause (inability to correctly > detect the C++ compiler as g++) rather than hacking around it. > * Format some of the patches so they can be used with git am > > Thanks to Philip Balister for helping me test the qmake improvements. > > > The following changes since commit 30253358f5e76fb7b25be27198b4c125e0dbdf2c: > > Quoting fixes (2012-02-26 12:50:36 +0000) > > are available in the git repository at: > git://git.openembedded.org/openembedded-core-contrib paule/qmake-target > > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paul > e/qmake-target > > Paul Eggleton (4): > qt4: fix compile error in Qt 4.8.0 with gcc 4.6 > qt4: build qmake for the target > qt4-tools-nativesdk: fix build of 4.7.4 > qt4-tools-nativesdk: improve and tidy up qmake build > > meta/recipes-qt/qt4/files/qmake-exists-check.patch | 19 ------- > meta/recipes-qt/qt4/files/target_qmake.patch | 16 ++++++ > meta/recipes-qt/qt4/qt-4.7.4.inc | 11 +---- > meta/recipes-qt/qt4/qt-4.8.0.inc | 13 +---- > .../qt4/qt-4.8.0/configure_oe_compiler.patch | 31 ++++++++++++ > meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch | 51 > ++++++++++++++++++++ meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | > 2 +- > meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb | 2 +- > meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 29 +++++++---- > meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb | 2 + > meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 2 +- > meta/recipes-qt/qt4/qt4.inc | 47 > ++++++++++++++++-- 12 files changed, 168 insertions(+), 57 deletions(-) > delete mode 100644 meta/recipes-qt/qt4/files/qmake-exists-check.patch > create mode 100644 meta/recipes-qt/qt4/files/target_qmake.patch > create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch > create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch