summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass2
-rw-r--r--classes/cmake.bbclass2
-rw-r--r--classes/qmake2.bbclass2
3 files changed, 4 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index d29ba4bfcf..89ee917d20 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -661,7 +661,7 @@ python base_do_fetch() {
bb.note("No conf/checksums.ini found, not checking checksums")
return
except:
- bb.note("Creating the CheckSum parser failed")
+ bb.note("Creating the CheckSum parser failed: %s:%s" % (sys.exc_info()[0], sys.exc_info()[1]))
return
pv = bb.data.getVar('PV', d, True)
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index b5b7b8655b..4978421b63 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -1,7 +1,7 @@
DEPENDS += " cmake-native "
# We want the staging and installing functions from autotools
-inherit autotools
+inherit autotools_stage
# Use in-tree builds by default but allow this to be changed
# since some packages do not support them (e.g. llvm 2.5).
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
index 26e813a036..37721898d6 100644
--- a/classes/qmake2.bbclass
+++ b/classes/qmake2.bbclass
@@ -19,3 +19,5 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
export OE_QMAKE_LIBS_QT = "qt"
export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4"
+export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4"