[PATCH] meta-toolchain-arago: Fix mkspecs and qt.conf for Qt Creator

[PATCH] meta-toolchain-arago: Fix mkspecs and qt.conf for Qt Creator

[Franklin S. Cooper Jr]

* Needed to adjust the location of the mkspecs and update the Prefix option in
  qt.conf for Qt Creator to properly detect the Qt installation within the SDK.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../meta/meta-toolchain-arago-tisdk.bb             |    2 +-
 .../recipes-core/meta/meta-toolchain-arago-qte.bb  |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
index 114ae1c..68df1bf 100644
--- a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
+++ b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
@@ -4,7 +4,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "libgnutls-dev libgnutls-extra26 libgnutls-openssl
 
 require recipes-core/meta/meta-toolchain-arago-qte.bb
 
-PR = "r2"
+PR = "r3"
 
 toolchain_create_sdk_env_script_append() {
     echo -e 'export PS1="\[\\e[32;1m\][linux-devkit]\[\\e[0m\]:\w> "' >> $script
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 11ff5b4..a104ca0 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
@@ -5,7 +5,7 @@ TOOLCHAIN_SUFFIX ?= "-qte-sdk"
 
 require meta-toolchain-arago.bb
 
-PR = "r14"
+PR = "r15"
 
 QT_DIR_NAME = "qtopia"
 
@@ -35,11 +35,11 @@ toolchain_create_sdk_env_script_append() {
 	qt_conf="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/qt.conf"
 	touch $qt_conf
 	echo '[Paths]' >> $qt_conf
-	echo 'Prefix = $(SDK_PATH)' >> $qt_conf
+	echo 'Prefix = $(SDK_PATH_TARGET)' >> $qt_conf
 	echo 'Libraries = $(OE_QMAKE_LIBDIR_QT)' >> $qt_conf
 	echo 'Headers = $(OE_QMAKE_INCDIR_QT)' >> $qt_conf
 
 	# make a symbolic link to mkspecs for compatibility with Nokia's SDK
 	# and QTCreator
-	(cd ${SDK_OUTPUT}/${SDKPATH}; ln -sf sysroots/${REAL_MULTIMACH_TARGET_SYS}${datadir}/${QT_DIR_NAME}/mkspecs mkspecs;)
+	(cd ${SDK_OUTPUT}/${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}; ln -sf usr/share/${QT_DIR_NAME}/mkspecs mkspecs;)
 }
-- 
1.7.0.4

Re: [PATCH] meta-toolchain-arago: Fix mkspecs and qt.conf for Qt Creator

[Denys Dmytriyenko]

On Wed, Jun 05, 2013 at 02:10:22PM -0500, Franklin S. Cooper Jr wrote:
> * Needed to adjust the location of the mkspecs and update the Prefix option in
>   qt.conf for Qt Creator to properly detect the Qt installation within the SDK.
> 
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../meta/meta-toolchain-arago-tisdk.bb             |    2 +-
>  .../recipes-core/meta/meta-toolchain-arago-qte.bb  |    6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
> index 114ae1c..68df1bf 100644
> --- a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
> +++ b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb
> @@ -4,7 +4,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "libgnutls-dev libgnutls-extra26 libgnutls-openssl
>  
>  require recipes-core/meta/meta-toolchain-arago-qte.bb
>  
> -PR = "r2"
> +PR = "r3"
>  
>  toolchain_create_sdk_env_script_append() {
>      echo -e 'export PS1="\[\\e[32;1m\][linux-devkit]\[\\e[0m\]:\w> "' >> $script
> 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 11ff5b4..a104ca0 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
> @@ -5,7 +5,7 @@ TOOLCHAIN_SUFFIX ?= "-qte-sdk"
>  
>  require meta-toolchain-arago.bb
>  
> -PR = "r14"
> +PR = "r15"
>  
>  QT_DIR_NAME = "qtopia"
>  
> @@ -35,11 +35,11 @@ toolchain_create_sdk_env_script_append() {
>  	qt_conf="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/qt.conf"
>  	touch $qt_conf
>  	echo '[Paths]' >> $qt_conf
> -	echo 'Prefix = $(SDK_PATH)' >> $qt_conf
> +	echo 'Prefix = $(SDK_PATH_TARGET)' >> $qt_conf
>  	echo 'Libraries = $(OE_QMAKE_LIBDIR_QT)' >> $qt_conf
>  	echo 'Headers = $(OE_QMAKE_INCDIR_QT)' >> $qt_conf
>  
>  	# make a symbolic link to mkspecs for compatibility with Nokia's SDK
>  	# and QTCreator
> -	(cd ${SDK_OUTPUT}/${SDKPATH}; ln -sf sysroots/${REAL_MULTIMACH_TARGET_SYS}${datadir}/${QT_DIR_NAME}/mkspecs mkspecs;)
> +	(cd ${SDK_OUTPUT}/${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}; ln -sf usr/share/${QT_DIR_NAME}/mkspecs mkspecs;)

Can use SDKTARGETSYSROOT here.


>  }
> -- 
> 1.7.0.4
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago