File rely_on_QT_ARCH_for_mmoc.patch of Package libmeegotouch

Overview Repositories Revisions Requests Users Attributes Meta

File rely_on_QT_ARCH_for_mmoc.patch of Package libmeegotouch

Description: select mmoc executable based on QT_ARCH
Also, this patch removes MEEGO_ARCH, rename IS_ARMEL to IS_ARM and
cleanup IS_ARM usage.
Author: Fathi Boudra <fathi.boudra@nokia.com>
--- a/configure
+++ b/configure
@@ -85,8 +85,8 @@ HAVE_MEEGOGRAPHICSSYSTEM=no
 
 OPT_SHADOW=maybe
 
-IS_ARMEL=no
-   
+IS_ARM=no
+
 # initalize variables used for installation
 M_INSTALL_PREFIX=/usr/local
 M_INSTALL_SYSCONFDIR=/etc
@@ -442,13 +442,13 @@ if [ $? -eq 0 ]; then
         HAVE_XCOMPOSITE=yes
     fi
 
-    # For Scratchbox and  For OBS/MeeGo
-    if [ ! -z "`uname -m | grep arm`" ]; then   
-    	IS_ARMEL=yes  
-    fi      
+    # For Scratchbox and for OBS/MeeGo
+    if [ ! -z "`uname -m | grep arm`" ]; then
+       IS_ARM=yes
+    fi
 
     if [ "$CFG_MEEGOGRAPHICSSYSTEM" != "no" ]; then
-        if  [ "$IS_ARMEL" = "yes" ]; then
+        if  [ "$IS_ARM" = "yes" ]; then
             HAVE_MEEGOGRAPHICSSYSTEM=yes
         else
             echo "MeeGo graphicssystem is only available for ARM."
@@ -651,11 +651,6 @@ if [ "$HAVE_MEEGOGRAPHICSSYSTEM" = "yes" ]; then
     MEEGOTOUCHCONFIG_DEPS="$MEEGOTOUCHCONFIG_DEPS HAVE_MEEGOGRAPHICSSYSTEM"
 fi
 
-if [ "$IS_ARMEL" = "yes" ]; then
-    MEEGOTOUCHCONFIG_DEPS="$MEEGOTOUCHCONFIG_DEPS IS_ARMEL"
-fi                               
-
-
 cat >>"$MEEGOTOUCHCONFIG.tmp" <<EOF
 # Autogenerated by configure script
 
--- a/mkspecs/features/meegotouch_mmoc.prf
+++ b/mkspecs/features/meegotouch_mmoc.prf
@@ -6,7 +6,7 @@ isEmpty(_MEEGOTOUCH_MMOC_PRF_) {
 
     contains(DEFINES, BUILD_M) {
         win32 {
-            contains(DEFINES, IS_ARMEL) {
+            equals(QT_ARCH, arm) | equals(QT_ARCH, armv6) {
                 M_MMOC_EXECUTABLE = perl.exe $$M_SOURCE_TREE/mmoc/mmoc.pl
             } else {
                 debug {
@@ -16,7 +16,7 @@ isEmpty(_MEEGOTOUCH_MMOC_PRF_) {
 	        }
             }
         } else {
-            contains(DEFINES, IS_ARMEL) {
+            equals(QT_ARCH, arm) | equals(QT_ARCH, armv6) {
                 M_MMOC_EXECUTABLE = perl $$M_SOURCE_TREE/mmoc/mmoc.pl
             } else {
                 M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/mmoc
@@ -26,11 +26,7 @@ isEmpty(_MEEGOTOUCH_MMOC_PRF_) {
         win32 {
             M_MMOC_EXECUTABLE = perl.exe $$M_SOURCE_TREE/mmoc/mmoc.pl
         } else {
-            isEmpty( MEEGO_ARCH ) {
-                MEEGO_ARCH = $$system( uname -m )
-            }
-
-            contains(MEEGO_ARCH, arm) {
+            equals(QT_ARCH, arm) | equals(QT_ARCH, armv6) {
                 M_MMOC_EXECUTABLE = mmoc.pl
             } else {
                 M_MMOC_EXECUTABLE = mmoc
--- a/src/predeps.pri
+++ b/src/predeps.pri
@@ -21,7 +21,7 @@ win32 {
 win32 {
     M_MMOC_EXECUTABLE = perl.exe $$M_SOURCE_TREE/mmoc/mmoc.pl
 } else {
-    contains(DEFINES, IS_ARMEL) {
+    equals(QT_ARCH, arm) | equals(QT_ARCH, armv6) {
         M_MMOC_EXECUTABLE = perl $$M_SOURCE_TREE/mmoc/mmoc.pl
     } else {
         M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/mmoc

Places

File rely_on_QT_ARCH_for_mmoc.patch of Package libmeegotouch

Places