Skip to content

Fix bug in igraph recipe #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 8, 2013
Merged

Fix bug in igraph recipe #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d521097
Recipes for igraph, a high-performance graph algorithms library http:…
clayote Nov 8, 2013
495acf9
wrong branch
clayote Nov 8, 2013
21663d9
Merge https://github.com/kivy/python-for-android
clayote Nov 20, 2013
4e295fd
Fix error when the igraph library is installed on the build machine f…
clayote Nov 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions recipes/igraph/get_platform.py
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions recipes/igraph/recipe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
#
Expand All @@ -18,7 +18,7 @@ RECIPE_igraph=$RECIPES_PATH/igraph


function prebuild_igraph() {
patch setup.py $RECIPE_igraph/setup.py.patch
true
}

function shouldbuild_igraph() {
Expand All @@ -29,6 +29,8 @@ function shouldbuild_igraph() {

function build_igraph() {
cd $BUILD_igraph
patch setup.py $RECIPE_igraph/setup.py.patch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

normally, the patch is done is the prebuild phase, as the build be recalled later, so double-patch will not work. Do another PR for that please :)

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
Expand Down
6 changes: 6 additions & 0 deletions recipes/igraph/setup.cfg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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