diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-03 13:41:33 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 12:08:18 +0000 |
| commit | 6b2a5d15ad20573502142b635e6cab9bcfb3b40a (patch) | |
| tree | c1ee9f5c1dc2fbc8ca7fc62e51f10c15c9e7bef7 /meta/recipes-qt/qt4/qt4-native.inc | |
| parent | dc154d698b3b455a35b65935f7f04a3b4f72f8b6 (diff) | |
| download | openembedded-core-contrib-6b2a5d15ad20573502142b635e6cab9bcfb3b40a.tar.gz | |
qt4: add version 4.8.0
Version 4.8.0 makes a few minor changes in the internal build system -
the following issues had to be worked around:
* The -qt-gif configure option has been removed. This is actually the
default and has been for some time, so remove it from qt4.inc.
* The mkspecs have been refactored requiring us to copy our g++.conf
file over the top of g++-unix.conf instead. Some modifications to this
file were also necessary to remove some settings that are now in other
conf files (and we don't modify those values in any case).
* The LD environment variable needs to be unset during configure, or
else the configure script overrides our value of QMAKE_LINK which
selects ${CXX} as our linker.
* QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure
script does not expect and cannot expand and this results in webkit
being disabled, so add a workaround for this.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-native.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-native.inc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc index 8a6eb4b69b..86f2440375 100644 --- a/meta/recipes-qt/qt4/qt4-native.inc +++ b/meta/recipes-qt/qt4/qt4-native.inc @@ -22,7 +22,7 @@ S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" EXTRA_OECONF = "-prefix ${prefix} \ -L ${STAGING_LIBDIR_NATIVE} \ -I ${STAGING_INCDIR_NATIVE} \ - -qt-libjpeg -qt-gif -system-zlib \ + -qt-libjpeg -system-zlib \ -no-libjpeg -no-libpng -no-libmng -no-libtiff \ -no-accessibility \ -no-cups \ @@ -39,6 +39,9 @@ EXTRA_OECONF = "-prefix ${prefix} \ EXTRA_OEMAKE = " " do_configure() { + # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD + (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } @@ -78,7 +81,13 @@ do_install() { install -d ${D}${datadir}/qt4/ cp -PfR mkspecs ${D}${datadir}/qt4/ ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ - cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ + if [ -f ${D}${datadir}/qt4/mkspecs/common/g++-unix.conf ] ; then + # mkspecs were refactored for 4.8.0 + cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt4/mkspecs/common/g++-unix.conf + else + cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt4/mkspecs/common/g++.conf + fi + cp -f ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/ |