aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-09-18 13:53:22 +0400
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-18 14:04:52 +0100
commit0d817e45b28a816a8cb5c67fabc3659fd98eb036 (patch)
treed358b4b4fd01b6fa92ce1e912ec65169413ec484
parent82f4cfcd1899c894e2bccbce4705380b98280c46 (diff)
downloadmeta-opie-0d817e45b28a816a8cb5c67fabc3659fd98eb036.tar.gz
meta-opie-0d817e45b28a816a8cb5c67fabc3659fd98eb036.tar.bz2
meta-opie-0d817e45b28a816a8cb5c67fabc3659fd98eb036.zip
opie: drop MOC and UIC overrides on command line
We do already provide our OE values for MOC and UIC via qmake.bbclass/linux-oe-g++ qmake config. Don't override MOC/UIC on command line. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-opie/libopie/libopie2.inc4
-rw-r--r--recipes-opie/libqpe/libqpe-opie.inc4
-rw-r--r--recipes-opie/libqtaux/libqtaux2.inc4
3 files changed, 6 insertions, 6 deletions
diff --git a/recipes-opie/libopie/libopie2.inc b/recipes-opie/libopie/libopie2.inc
index bad4041..aa69af1 100644
--- a/recipes-opie/libopie/libopie2.inc
+++ b/recipes-opie/libopie/libopie2.inc
@@ -8,7 +8,7 @@ I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
DEPENDS = "libqpe-opie libpcap sqlite3 bluez4"
PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
-INC_PR = "r15"
+INC_PR = "r16"
S = "${WORKDIR}/libopie2"
@@ -61,7 +61,7 @@ do_compile() {
ln -sf ../../../opiepim/private/$header ${S}/include/opie2/private
done
- oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic DESTDIR=${S}
+ oe_runmake DESTDIR=${S}
}
do_install() {
diff --git a/recipes-opie/libqpe/libqpe-opie.inc b/recipes-opie/libqpe/libqpe-opie.inc
index 7ddc40c..ea83f98 100644
--- a/recipes-opie/libqpe/libqpe-opie.inc
+++ b/recipes-opie/libqpe/libqpe-opie.inc
@@ -7,7 +7,7 @@ LICENSE = "GPL"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
DEPENDS = "uicmoc-native virtual/libqte2 sysfsutils"
PROVIDES = "virtual/libqpe1"
-INC_PR = "r9"
+INC_PR = "r10"
S = "${WORKDIR}/library"
inherit palmtop
@@ -45,7 +45,7 @@ do_compile() {
install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
done
rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
- oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic
+ oe_runmake
}
do_install() {
diff --git a/recipes-opie/libqtaux/libqtaux2.inc b/recipes-opie/libqtaux/libqtaux2.inc
index 2955ab8..997c2c6 100644
--- a/recipes-opie/libqtaux/libqtaux2.inc
+++ b/recipes-opie/libqtaux/libqtaux2.inc
@@ -5,14 +5,14 @@ LICENSE = "GPL"
# FIXME stopgap until split archives have license files included
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-INC_PR = "r2"
+INC_PR = "r3"
S = "${WORKDIR}/libqtaux"
inherit opie
do_compile() {
- oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic DESTDIR=${S}
+ oe_runmake DESTDIR=${S}
}
do_install() {