Acked-by: Chase Maupin <[email protected]>
>-----Original Message----- >From: [email protected] [mailto:meta-arago- >[email protected]] On Behalf Of Denys Dmytriyenko >Sent: Monday, November 11, 2013 10:42 PM >To: [email protected] >Subject: [meta-arago] [PATCH 6/6] meta-toolchain-arago-qte: update >to support Qt4 and Qt5 SDK > >From: Denys Dmytriyenko <[email protected]> > >Signed-off-by: Denys Dmytriyenko <[email protected]> >--- > .../recipes-core/meta/meta-toolchain-arago-qte.bb | 31 >+++++++++++++--------- > 1 file changed, 19 insertions(+), 12 deletions(-) > >diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain- >arago-qte.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain- >arago-qte.bb >index 6fcf4b4..960b99b 100644 >--- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago- >qte.bb >+++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago- >qte.bb >@@ -1,15 +1,20 @@ > # Qt Embedded toolchain > TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-arago-qte- >toolchain-host" >-TOOLCHAIN_TARGET_TASK ?= "packagegroup-arago-qte-toolchain- >target" >+TOOLCHAIN_TARGET_TASK ?= "${@base_conditional('QT_PROVIDER', >'qt5', 'packagegroup-arago-qt5-toolchain-target', 'packagegroup- >arago-qte-toolchain-target', d)}" > TOOLCHAIN_SUFFIX ?= "-qte-sdk" > > require meta-toolchain-arago.bb > >-PR = "r15" >+PR = "r16" > >-QT_DIR_NAME = "qtopia" >+# There could be qt5, qt4e and qt4x11 providers, but we don't >support qt4x11 for now >+QT_DIR_NAME = "${@base_conditional('QT_PROVIDER', 'qt5', 'qt5', >'qtopia', d)}" >+QT_BIN_PREFIX = "${@base_conditional('QT_PROVIDER', 'qt5', >"${QT_DIR_NAME}/", '', d)}" >+QT_BIN_SUFFIX = "${@base_conditional('QT_PROVIDER', 'qt5', '', >'4', d)}" >+QT_MKSPECS_LOCATION = "${@base_conditional('QT_PROVIDER', 'qt5', >"${libdir}", "${datadir}", d)}" > > toolchain_create_sdk_env_script_append() { >+ echo 'export >PATH=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_DIR_NAME}:$PATH' >> >$script > echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script > echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script > echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script >@@ -19,15 +24,17 @@ toolchain_create_sdk_env_script_append() { > echo 'export OE_QMAKE_AR=$AR' >> $script > echo 'export OE_QMAKE_LIBDIR_QT=$SDK_PATH_TARGET${libdir}' >>> $script > echo 'export >OE_QMAKE_INCDIR_QT=$SDK_PATH_TARGET${includedir}/${QT_DIR_NAME}' >>> $script >- echo 'export >OE_QMAKE_MOC=$SDK_PATH_NATIVE${bindir_nativesdk}/moc4' >> $script >- echo 'export >OE_QMAKE_UIC=$SDK_PATH_NATIVE${bindir_nativesdk}/uic4' >> $script >- echo 'export >OE_QMAKE_UIC3=$SDK_PATH_NATIVE${bindir_nativesdk}/uic34' >> >$script >- echo 'export >OE_QMAKE_RCC=$SDK_PATH_NATIVE${bindir_nativesdk}/rcc4' >> $script >- echo 'export >OE_QMAKE_QDBUSCPP2XML=$SDK_PATH_NATIVE${bindir_nativesdk}/qdbuscpp >2xml4' >> $script >- echo 'export >OE_QMAKE_QDBUSXML2CPP=$SDK_PATH_NATIVE${bindir_nativesdk}/qdbusxml >2cpp4' >> $script >- echo 'export >OE_QMAKE_QT_CONFIG=$SDK_PATH_TARGET${datadir}/${QT_DIR_NAME}/mkspe >cs/qconfig.pri' >> $script >+ echo 'export >OE_QMAKE_MOC=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_BIN_PREFIX}m >oc${QT_BIN_SUFFIX}' >> $script >+ echo 'export >OE_QMAKE_UIC=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_BIN_PREFIX}u >ic${QT_BIN_SUFFIX}' >> $script >+ echo 'export >OE_QMAKE_UIC3=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_BIN_PREFIX} >uic3${QT_BIN_SUFFIX}' >> $script >+ echo 'export >OE_QMAKE_RCC=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_BIN_PREFIX}r >cc${QT_BIN_SUFFIX}' >> $script >+ echo 'export >OE_QMAKE_QDBUSCPP2XML=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_BIN >_PREFIX}qdbuscpp2xml${QT_BIN_SUFFIX}' >> $script >+ echo 'export >OE_QMAKE_QDBUSXML2CPP=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_BIN >_PREFIX}qdbusxml2cpp${QT_BIN_SUFFIX}' >> $script >+ echo 'export >OE_QMAKE_QT_CONFIG=$SDK_PATH_TARGET${QT_MKSPECS_LOCATION}/${QT_DIR >_NAME}/mkspecs/qconfig.pri' >> $script > echo 'export OE_QMAKE_STRIP="echo"' >> $script >- echo 'export >QMAKESPEC=$SDK_PATH_TARGET${datadir}/${QT_DIR_NAME}/mkspecs/linux- >g++' >> $script >+ echo 'export >QMAKESPEC=$SDK_PATH_TARGET${QT_MKSPECS_LOCATION}/${QT_DIR_NAME}/mk >specs/linux-g++' >> $script >+ echo 'export QMAKE_DEFAULT_LIBDIRS=${QT_QMAKE_LIBDIR_QT}' >> >$script >+ echo 'export QMAKE_DEFAULT_INCDIRS=${QT_QMAKE_INCDIR_QT}' >> >$script > > #Adds qt.conf file that points qmake to properly locate Qt >library and header files. > #This enables Qt Creator to work properly >@@ -41,5 +48,5 @@ toolchain_create_sdk_env_script_append() { > > # make a symbolic link to mkspecs for compatibility with >Nokia's SDK > # and QTCreator >- (cd ${SDK_OUTPUT}/${SDKTARGETSYSROOT}; ln -sf >usr/share/${QT_DIR_NAME}/mkspecs mkspecs;) >+ (cd ${SDK_OUTPUT}/${SDKTARGETSYSROOT}; ln -sf >.${QT_MKSPECS_LOCATION}/${QT_DIR_NAME}/mkspecs mkspecs;) > } >-- >1.8.3.2 > >_______________________________________________ >meta-arago mailing list >[email protected] >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
