sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

qt4: fix incorrect architecture for qt4 tools 

Don't install the native staging versions of the qt4 tools in the bin
directory; we have been doing this for a very long time but it is no
longer necessary since we specify them via the QMAKE_UIC, QMAKE_MOC etc.
variables. Doing so was sometimes resulting in those executables being
the ones that end up being packaged (probably only sometimes due to
different date/time values on the staging files and the interaction
with make).

Fixes [YOCTO #1856].

(From OE-Core rev: dc154d698b3b455a35b65935f7f04a3b4f72f8b6)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2012-01-03 13:41:32 +00:00 committed by Richard Purdie
parent 120ea473c4
commit 99a6e1a3a4
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-qt/qt4/qt-4.7.4.inc
View File

@ -50,10 +50,6 @@ do_compile() {
fi
unset CFLAGS CXXFLAGS
install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
oe_runmake ${EXTRA_ENV}
}

2
meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
View File

@ -1,7 +1,7 @@
require qt-${PV}.inc
require qt4-embedded.inc
PR = "${INC_PR}.5"
PR = "${INC_PR}.6"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "

2
meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
View File

@ -1,7 +1,7 @@
require qt4-x11-free.inc
require qt-${PV}.inc
PR = "${INC_PR}.5"
PR = "${INC_PR}.6"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "