Skip to content
Permalink
Browse files
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
  • Loading branch information
sebastic committed Mar 28, 2014
1 parent 7db6ae5 commit 3d44c5934aba0c4a1e0919549f50f1650140de57
Showing with 9 additions and 2 deletions.
  1. +5 −0 python/CMakeLists.txt
  2. +1 −1 python/core/composer/qgscomposerscalebar.sip
  3. +3 −1 python/core/qgsclipper.sip
@@ -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)
@@ -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

@@ -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

0 comments on commit 3d44c59

Please sign in to comment.