summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-10-09 18:53:14 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-10 16:44:31 +0100
commitddf7d2bef8442ac93ca4f6b5f1d72ce851a8c99e (patch)
treeaa1b804cf38a4b30c002499cf070cae988251fc4
parentee0ab903f8195d9ce43187a97ede1261b02eb691 (diff)
downloadpoky-ddf7d2bef8442ac93ca4f6b5f1d72ce851a8c99e.tar.gz
meta-toolchain-qt: Fix environment population
The generation of the environment has change since the change to use a meta-environment canadian package in the OE-Core, the SDK environment setting has been broken. This uses the new subscript environment to fix it. (From OE-Core rev: e7b9e1df19062cfbcd72c90295829424cae6fbed) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/meta/meta-toolchain-qt.inc21
1 files changed, 12 insertions, 9 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/meta/recipes-qt/meta/meta-toolchain-qt.inc
index 53e5322811..7e75d93b14 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qt.inc
+++ b/meta/recipes-qt/meta/meta-toolchain-qt.inc
@@ -4,29 +4,32 @@ TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-${QTNAME}-${DISTRO_VERSION}"
4 4
5require recipes-core/meta/meta-toolchain.bb 5require recipes-core/meta/meta-toolchain.bb
6 6
7QT_TOOLS_PREFIX = "${SDKPATHNATIVE}${bindir_nativesdk}" 7QT_TOOLS_PREFIX = "$OECORE_NATIVE_SYSROOT${bindir_nativesdk}"
8 8
9toolchain_create_sdk_env_script_append() { 9create_sdk_files_append() {
10 echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script 10 mkdir -p ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/
11 script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/${QT_DIR_NAME}.sh
12
13 echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' > $script
11 echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script 14 echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
12 echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script 15 echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
13 echo 'export OE_QMAKE_CC=$CC' >> $script 16 echo 'export OE_QMAKE_CC=$CC' >> $script
14 echo 'export OE_QMAKE_CXX=$CXX' >> $script 17 echo 'export OE_QMAKE_CXX=$CXX' >> $script
15 echo 'export OE_QMAKE_LINK=$CXX' >> $script 18 echo 'export OE_QMAKE_LINK=$CXX' >> $script
16 echo 'export OE_QMAKE_AR=$AR' >> $script 19 echo 'export OE_QMAKE_AR=$AR' >> $script
17 echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script 20 echo 'export OE_QMAKE_LIBDIR_QT=$OECORE_TARGET_SYSROOT${libdir}' >> $script
18 echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script 21 echo 'export OE_QMAKE_INCDIR_QT=$OECORE_TARGET_SYSROOT${includedir}/${QT_DIR_NAME}' >> $script
19 echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script 22 echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script
20 echo 'export OE_QMAKE_UIC=${QT_TOOLS_PREFIX}/uic4' >> $script 23 echo 'export OE_QMAKE_UIC=${QT_TOOLS_PREFIX}/uic4' >> $script
21 echo 'export OE_QMAKE_UIC3=${QT_TOOLS_PREFIX}/uic34' >> $script 24 echo 'export OE_QMAKE_UIC3=${QT_TOOLS_PREFIX}/uic34' >> $script
22 echo 'export OE_QMAKE_RCC=${QT_TOOLS_PREFIX}/rcc4' >> $script 25 echo 'export OE_QMAKE_RCC=${QT_TOOLS_PREFIX}/rcc4' >> $script
23 echo 'export OE_QMAKE_QDBUSCPP2XML=${QT_TOOLS_PREFIX}/qdbuscpp2xml4' >> $script 26 echo 'export OE_QMAKE_QDBUSCPP2XML=${QT_TOOLS_PREFIX}/qdbuscpp2xml4' >> $script
24 echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script 27 echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script
25 echo 'export OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script 28 echo 'export OE_QMAKE_QT_CONFIG=$OECORE_TARGET_SYSROOT${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
26 echo 'export QMAKESPEC=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script 29 echo 'export QMAKESPEC=$OECORE_TARGET_SYSROOT${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
27 echo 'export QT_CONF_PATH=${SDKPATHNATIVE}/${sysconfdir}/qt.conf' >> $script 30 echo 'export QT_CONF_PATH=$OECORE_NATIVE_SYSROOT${sysconfdir}/qt.conf' >> $script
28 31
29 # make a symbolic link to mkspecs for compatibility with Qt SDK 32 # make a symbolic link to mkspecs for compatibility with Qt SDK
30 # and Qt Creator 33 # and Qt Creator
31 (cd ${SDK_OUTPUT}/${QT_TOOLS_PREFIX}/..; ln -s ${SDKTARGETSYSROOT}/usr/share/${QT_DIR_NAME}/mkspecs mkspecs;) 34 (cd ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/..; ln -s ${SDKTARGETSYSROOT}/usr/share/${QT_DIR_NAME}/mkspecs mkspecs;)
32} 35}