Fix error when the igraph library is installed on the build machine for a non-ARM achitecture.

clayote · clayote · commit 4e295fdd6c66 · 2013-11-29T10:18:19.000-05:00
Also, get_platform.py was never really used. I thought I'd need to know exactly how distutils wanted me to write the architecture name, but I didn't really.
diff --git a/recipes/igraph/get_platform.py b/recipes/igraph/get_platform.py
diff --git a/recipes/igraph/recipe.sh b/recipes/igraph/recipe.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+b#!/bin/bash
 
 # Recipe for the Python interface to igraph, a high-performance graph library in C: http://igraph.org/
 #
@@ -18,7 +18,7 @@ RECIPE_igraph=$RECIPES_PATH/igraph
 
 
 function prebuild_igraph() {
-    patch setup.py $RECIPE_igraph/setup.py.patch
+    true
 }
 
 function shouldbuild_igraph() {
@@ -29,6 +29,8 @@ function shouldbuild_igraph() {
 
 function build_igraph() {
     cd $BUILD_igraph
+    patch setup.py $RECIPE_igraph/setup.py.patch
+    patch setup.cfg $RECIPE_igraph/setup.cfg.patch
     push_arm
 
     try $HOSTPYTHON setup.py build_ext -I"$BUILD_PATH/python-install/include/igraph:$ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/4.4.3/libs/armeabi/include" -L"$BUILD_PATH/python-install/lib:$ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/4.4.3/libs/armeabi" -l gnustl_static -p arm-gnueabi install
diff --git a/recipes/igraph/setup.cfg.patch b/recipes/igraph/setup.cfg.patch
@@ -0,0 +1,6 @@
+2,3c2,3
+< include_dirs = ../../build/include:../../include:/usr/local/include:/usr/include
+< library_dirs = ../../build/src/.libs:../../src/.libs:/usr/local/lib:/usr/lib
+---
+> include_dirs = ../../build/include:../../include
+> library_dirs = ../../build/src/.libs:../../src/.libs
