From: Eric Bénard Date: Thu, 25 Nov 2010 15:54:29 +0000 (+0100) Subject: qt4x11: set QT_LIBINFIX and QT_DIR_NAME X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26002b31b7232ee71249cc39fd8184d80ecb9ec2;p=openembedded.git qt4x11: set QT_LIBINFIX and QT_DIR_NAME this will fix the following issue with qwt 5.2.1 where obj dir is: work/armv4t-oe-linux-gnueabi/qwt-5.2.1-r0/qwt-5.2.1/src/obj${QT_LIBINFIX}/ instead of : work/armv4t-oe-linux-gnueabi/qwt-5.2.1-r0/qwt-5.2.1/src/obj/ From: Martin Jansa Acked-by: Koen Kooi Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index 2d56b7e95b..abb1d9d2e4 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -2,5 +2,8 @@ DEPENDS_prepend = "${@["qt4-x11-free ", ""][(bb.data.getVar('PN', d, 1)[:12] == inherit qmake2 +QT_DIR_NAME = "qt4" +QT_LIBINFIX = "" + # Qt4 uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm"