[15/15] setup.sh: QMAKESPEC can be specified by a short name

Submitted by christian.braunersorensen@prevas.dk on July 25, 2014, 10:28 a.m.

Details

Message ID CFDF955F78BEAB47A018765A600E2BDC938F05D7@VMPREVAS1.prevas.se
State Accepted
Delegated to: Christian Sørensen
Headers show

Commit Message

christian.braunersorensen@prevas.dk July 25, 2014, 10:28 a.m.
Hi Svend Aaage

Thanks for the patch!

I squashed this commit together with the commit were you upgraded the setup script. 

/Christian

Patch hide | download patch | download mbox

diff --git a/recipes/sdk/qt5-sdk-script/setup.sh b/recipes/sdk/qt5-sdk-script/setup.sh
index 6539e0f..d873b3e 100755
--- a/recipes/sdk/qt5-sdk-script/setup.sh
+++ b/recipes/sdk/qt5-sdk-script/setup.sh
@@ -67,13 +67,6 @@  export OE_QMAKE_CXX="${CXX}"
 export OE_QMAKE_AR="${AR}"
 export OE_QMAKE_STRIP="${STRIP}"

-# Must we differentiate here?
-if [[ $CURRENT_OS == Linux* ]] ; then
-  export QMAKESPEC="${SYS}usr/share/qt5/mkspecs/linux-oe-g++"
-else
-  export QMAKESPEC="linux-oe-g++"
-fi
-
 QT_CONF_FILE=${TOOL}/qt.conf
 touch ${QT_CONF_FILE} || exit 1

@@ -96,3 +89,5 @@  echo "TargetSpec = ${SYS_REL_TOOL}/usr/share/qt5/mkspecs/linux-oe-g++" >> ${QT_C

 # Set the paths to the config file
 export QT_CONF_PATH="${QT_CONF_FILE}"
+# And Specs for target
+export QMAKESPEC="linux-oe-g++"