diff options
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}" | |||
22 | EXTRA_OECONF = "-prefix ${prefix} \ | 22 | EXTRA_OECONF = "-prefix ${prefix} \ |
23 | -L ${STAGING_LIBDIR_NATIVE} \ | 23 | -L ${STAGING_LIBDIR_NATIVE} \ |
24 | -I ${STAGING_INCDIR_NATIVE} \ | 24 | -I ${STAGING_INCDIR_NATIVE} \ |
25 | -qt-libjpeg -qt-gif -system-zlib \ | 25 | -qt-libjpeg -system-zlib \ |
26 | -no-libjpeg -no-libpng -no-libmng -no-libtiff \ | 26 | -no-libjpeg -no-libpng -no-libmng -no-libtiff \ |
27 | -no-accessibility \ | 27 | -no-accessibility \ |
28 | -no-cups \ | 28 | -no-cups \ |
@@ -39,6 +39,9 @@ EXTRA_OECONF = "-prefix ${prefix} \ | |||
39 | EXTRA_OEMAKE = " " | 39 | EXTRA_OEMAKE = " " |
40 | 40 | ||
41 | do_configure() { | 41 | do_configure() { |
42 | # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++) | ||
43 | unset LD | ||
44 | |||
42 | (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" | 45 | (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" |
43 | } | 46 | } |
44 | 47 | ||
@@ -78,7 +81,13 @@ do_install() { | |||
78 | install -d ${D}${datadir}/qt4/ | 81 | install -d ${D}${datadir}/qt4/ |
79 | cp -PfR mkspecs ${D}${datadir}/qt4/ | 82 | cp -PfR mkspecs ${D}${datadir}/qt4/ |
80 | ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ | 83 | ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ |
81 | cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ | 84 | if [ -f ${D}${datadir}/qt4/mkspecs/common/g++-unix.conf ] ; then |
85 | # mkspecs were refactored for 4.8.0 | ||
86 | cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt4/mkspecs/common/g++-unix.conf | ||
87 | else | ||
88 | cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt4/mkspecs/common/g++.conf | ||
89 | fi | ||
90 | cp -f ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ | ||
82 | 91 | ||
83 | install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/ | 92 | install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/ |
84 | 93 | ||