diff options
| author |   Koen Kooi <koen@openembedded.org> | 2010-12-25 15:28:18 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-12-25 21:25:56 +0100 |
| commit | 8a44e2b59d3616a99b6c827ee042807fd8ab4ed8 (patch) | |
| tree | 6340c5c15a5e317048da63ea0405ce5a84bab7b4 | |
| parent | f27ed804ca22aaee28c0995fa1fdd15306e0471e (diff) | |
| download | openembedded-8a44e2b59d3616a99b6c827ee042807fd8ab4ed8.tar.gz | |
qmake2: also define OE_QMAKE_AR in the environment files
Signed-off-by: Koen Kooi <koen@openembedded.org>
| -rw-r--r-- | recipes/qmake/qmake2.inc | 2 | ||||
| -rw-r--r-- | recipes/qmake/qmake2_2.10a.bb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc index 2e78a44281..f2631b5f7e 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 = "r11" +PR = "r12" # We call 'moc' during the build DEPENDS = "qt4-tools-native" diff --git a/recipes/qmake/qmake2_2.10a.bb b/recipes/qmake/qmake2_2.10a.bb index d07f68baa5..77d909f8eb 100644 --- a/recipes/qmake/qmake2_2.10a.bb +++ b/recipes/qmake/qmake2_2.10a.bb @@ -18,6 +18,7 @@ do_install() { touch $script echo 'export QT_DIR_NAME=qtopia' >> $script echo 'export QT_LIBINFIX=E' >> $script + echo 'export OE_QMAKE_AR=ar' >> $script echo 'export OE_QMAKE_CC=gcc' >> $script echo 'export OE_QMAKE_CXX=g++' >> $script echo 'export OE_QMAKE_LINK=g++' >> $script @@ -34,6 +35,7 @@ do_install() { script="${D}/${datadir}/qt4/environment-setup" touch $script + echo 'export OE_QMAKE_AR=ar' >> $script echo 'export OE_QMAKE_CC=gcc' >> $script echo 'export OE_QMAKE_CXX=g++' >> $script echo 'export OE_QMAKE_LINK=g++' >> $script |