[oe-commits] Philip Balister : qmake2: Define env var for strip. Convert to use INC_PR.
git version control
git at git.openembedded.org
Thu Mar 31 20:27:46 UTC 2011
Module: openembedded.git
Branch: 2011.03-maintenance
Commit: c13a42e1c6cd0b469ca8c39140bfd80e0dbe3f72
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c13a42e1c6cd0b469ca8c39140bfd80e0dbe3f72
Author: Philip Balister <philip at balister.org>
Date: Wed Mar 30 18:07:11 2011 -0400
qmake2: Define env var for strip. Convert to use INC_PR.
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
recipes/qmake/qmake2.inc | 2 +-
recipes/qmake/qmake2_2.10a.bb | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc
index f2631b5..9791842 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 = "r12"
+INC_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 77d909f..d8bb528 100644
--- a/recipes/qmake/qmake2_2.10a.bb
+++ b/recipes/qmake/qmake2_2.10a.bb
@@ -1,5 +1,6 @@
QTVERSION="4.4.3"
FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2"
+PR = "${INC_PR}.1"
BBCLASSEXTEND = "native sdk"
@@ -22,6 +23,7 @@ do_install() {
echo 'export OE_QMAKE_CC=gcc' >> $script
echo 'export OE_QMAKE_CXX=g++' >> $script
echo 'export OE_QMAKE_LINK=g++' >> $script
+ echo 'export OE_QMAKE_STRIP=strip' >> $script
echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script
echo 'export OE_QMAKE_INCDIR_QT=${includedir}/qtopia' >> $script
echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script
@@ -39,6 +41,7 @@ do_install() {
echo 'export OE_QMAKE_CC=gcc' >> $script
echo 'export OE_QMAKE_CXX=g++' >> $script
echo 'export OE_QMAKE_LINK=g++' >> $script
+ echo 'export OE_QMAKE_STRIP=strip' >> $script
echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script
echo 'export OE_QMAKE_INCDIR_QT=${includedir}/qt4' >> $script
echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script
More information about the Openembedded-commits
mailing list