Disable features on ARM.

Building QGIS on ARM produces the error: sip: qgis/python/core/qgsclipper.sip:44: \ QgsClipper::trimFeature() unsupported function argument type - provide %MethodCode and a C++ signature For the Android builds this was fixed in commit 2cc6847. This patch adapts the Android fix, by disabling the SIP features on all ARM systems. Bug-Debian: http://bugs.debian.org/737814
qgis · Mar 28, 2014 · 3d44c59 · 3d44c59
1 parent 7db6ae5
commit 3d44c59
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -55,6 +55,11 @@ IF(NOT ANDROID)
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ANDROID)
 ENDIF(NOT ANDROID)
 
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ARM)
+ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+
 IF(NOT WITH_TOUCH)
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH)
 ENDIF(NOT WITH_TOUCH)

diff --git a/python/core/composer/qgscomposerscalebar.sip b/python/core/composer/qgscomposerscalebar.sip
@@ -109,7 +109,7 @@ class QgsComposerScaleBar: QgsComposerItem
      of the segment
      @note python bindings not available on android
      */
-%If (!ANDROID)
+%If (!ARM)
     void segmentPositions( QList<QPair<double, double> >& posWidthList ) const;
 %End
 

diff --git a/python/core/qgsclipper.sip b/python/core/qgsclipper.sip
@@ -1,3 +1,5 @@
+%Feature ARM
+
 class QgsClipper
 {
 %TypeHeaderCode
@@ -34,7 +36,7 @@ class QgsClipper
     // A handy way to refer to the four boundaries
     enum Boundary {XMax, XMin, YMax, YMin};
 
-%If (!ANDROID)
+%If (!ARM)
     // Trims the given feature to a rectangular box. Returns the trimmed
     // feature in x and y. The shapeOpen parameter determines whether
     // the function treats the points as a closed shape (polygon), or as