Need for qmake_base.bbclass?
Hi,
I've diff'ed qmake_base.bbclass in meta-oe and oe-core, with the result at the end of the e-mail.
I'd like to get rid of qmake_base.bbclass in oe-core.
If we merge the second hunk of the diff to oe-core, do we risk getting any failures/problems?
Locally, I've been running without the meta-oe version for a while, but I'm only building a subset of all packages (and a subset of Qt as well).
Cheers,
Anders
--- ../openembedded-core/meta/classes/qmake_base.bbclass
2011-06-09 22:05:03.030620629 +0200
+++ meta-oe/classes/qmake_base.bbclass 2011-08-16 08:34:54.175700192 +0200
@@ -13,6 +13,9 @@
export OE_QMAKE_STRIP="echo"
export OE_QMAKE_RPATH="-Wl,-rpath-link,"
+# do not export STRIP to the environment
+STRIP[unexport] = "1"
+
# default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
oe_qmake_mkspecs () {
@@ -47,7 +50,7 @@
qmake_base_do_configure() {
case ${QMAKESPEC} in
- *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++)
+
*linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++|*linux-uclibceabi-oe-g++)
;;
*-oe-g++)
die Unsupported target ${TARGET_OS} for oe-g++ qmakespec
@@ -92,11 +95,6 @@
bbnote "qmake prevar substitution:
${EXTRA_QMAKEVARS_PRE}"
fi
- # Hack .pro files to use OE utilities
- find -name '*.pro' \
- -exec sed -i -e 's,=\s*.*/lrelease,=
${OE_QMAKE_LRELEASE},g' \
- -e 's,=\s*.*/lupdate,= ${OE_QMAKE_LUPDATE},g'
'{}' ';'
-
#bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -oMakefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
unset QMAKESPEC || true
${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile$QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"
Signature · 2 lines
Anders Darander ChargeStorm AB
Quoted 1 line · On Tuesday 16 August 2011 08:49:08 Anders Darander wrote:
I'd like to get rid of qmake_base.bbclass in oe-core.
Presumably you mean "in meta-oe" here...
Quoted 2 lines
If we merge the second hunk of the diff to oe-core, do we risk getting any failures/problems?
Looks pretty reasonable to me, at a glance I can't see it causing any issues.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 4 lines · Paul Eggleton
Quoted 1 line · On Tuesday 16 August 2011 08:49:08 Anders Darander wrote:
I'd like to get rid of qmake_base.bbclass in oe-core.
Presumably you mean "in meta-oe" here...
Yes, that's right. (I don't know what it is with me and e-mail the latest couple of days...)
Quoted 4 lines
Quoted 2 lines
If we merge the second hunk of the diff to oe-core, do we risk getting any failures/problems?
Looks pretty reasonable to me, at a glance I can't see it causing any issues.
Good to hear. If no-one else has any objections, I'll submit a patch delete qmake_base.bbclass, after submitting and getting my oe-core patches merged.
Cheers,
Anders
Signature · 2 lines
Anders Darander ChargeStorm AB