[PATCH] meta-toolchain-arago-qte: Fix Qt library and include files path

[PATCH] meta-toolchain-arago-qte: Fix Qt library and include files path

[Franklin S. Cooper Jr]

* Within the toolchain sdk the Qt library files are located at
  SDK_PATH/arm-arago-linux-gnueabi/usr/lib not at SDK_PATH/usr/lib.
  The Qt include files are located in a similar location but instead of /usr/lib
  it is located at /usr/include.
* This commit points qmake to the proper location of these Qt library and include
  files.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../recipes-core/meta/meta-toolchain-arago-qte.bb  |    6 +++---
 1 files changed, 3 insertions(+), 3 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 54040e0..e349783 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_OUTPUTNAME = "${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}-qte-sdk-${SDK_ARC
 
 require meta-toolchain-arago.bb
 
-PR = "r3"
+PR = "r4"
 
 QT_DIR_NAME = "qtopia"
 
@@ -17,8 +17,8 @@ toolchain_create_sdk_env_script_append() {
     echo -e 'export OE_QMAKE_CXX=\x24{TARGET_PREFIX}g++' >> $script
     echo -e 'export OE_QMAKE_LINK=\x24{TARGET_PREFIX}g++' >> $script
     echo -e 'export OE_QMAKE_AR=\x24{TARGET_PREFIX}ar' >> $script
-    echo 'export OE_QMAKE_LIBDIR_QT=$SDK_PATH${libdir}' >> $script
-    echo 'export OE_QMAKE_INCDIR_QT=$SDK_PATH${includedir}/${QT_DIR_NAME}' >> $script
+    echo 'export OE_QMAKE_LIBDIR_QT=$SDK_PATH/$TARGET_SYS${libdir}' >> $script
+    echo 'export OE_QMAKE_INCDIR_QT=$SDK_PATH/$TARGET_SYS${includedir}/${QT_DIR_NAME}' >> $script
     echo 'export OE_QMAKE_MOC=$SDK_PATH${bindir_nativesdk}/moc4' >> $script
     echo 'export OE_QMAKE_UIC=$SDK_PATH${bindir_nativesdk}/uic4' >> $script
     echo 'export OE_QMAKE_UIC3=$SDK_PATH${bindir_nativesdk}/uic34' >> $script
-- 
1.7.0.4

Re: [PATCH] meta-toolchain-arago-qte: Fix Qt library and include files path

[Denys Dmytriyenko]

On Thu, Nov 01, 2012 at 01:41:50PM -0500, Franklin S. Cooper Jr wrote:
> * Within the toolchain sdk the Qt library files are located at
>   SDK_PATH/arm-arago-linux-gnueabi/usr/lib not at SDK_PATH/usr/lib.
>   The Qt include files are located in a similar location but instead of /usr/lib
>   it is located at /usr/include.
> * This commit points qmake to the proper location of these Qt library and include
>   files.
> 
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../recipes-core/meta/meta-toolchain-arago-qte.bb  |    6 +++---
>  1 files changed, 3 insertions(+), 3 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 54040e0..e349783 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_OUTPUTNAME = "${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}-qte-sdk-${SDK_ARC
>  
>  require meta-toolchain-arago.bb
>  
> -PR = "r3"
> +PR = "r4"
>  
>  QT_DIR_NAME = "qtopia"
>  
> @@ -17,8 +17,8 @@ toolchain_create_sdk_env_script_append() {
>      echo -e 'export OE_QMAKE_CXX=\x24{TARGET_PREFIX}g++' >> $script
>      echo -e 'export OE_QMAKE_LINK=\x24{TARGET_PREFIX}g++' >> $script
>      echo -e 'export OE_QMAKE_AR=\x24{TARGET_PREFIX}ar' >> $script
> -    echo 'export OE_QMAKE_LIBDIR_QT=$SDK_PATH${libdir}' >> $script
> -    echo 'export OE_QMAKE_INCDIR_QT=$SDK_PATH${includedir}/${QT_DIR_NAME}' >> $script
> +    echo 'export OE_QMAKE_LIBDIR_QT=$SDK_PATH/$TARGET_SYS${libdir}' >> $script
> +    echo 'export OE_QMAKE_INCDIR_QT=$SDK_PATH/$TARGET_SYS${includedir}/${QT_DIR_NAME}' >> $script

Ah, right, I didn't notice that I borked these 2 with my last patch...


>      echo 'export OE_QMAKE_MOC=$SDK_PATH${bindir_nativesdk}/moc4' >> $script
>      echo 'export OE_QMAKE_UIC=$SDK_PATH${bindir_nativesdk}/uic4' >> $script
>      echo 'export OE_QMAKE_UIC3=$SDK_PATH${bindir_nativesdk}/uic34' >> $script
> -- 
> 1.7.0.4
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago