8000 Merge pull request #177 from LogicalDash/igraph · studycwq/python-for-android@c87a33c · GitHub
[go: up one dir, main page]
Skip to content

    • Commit c87a33c

    Browse files
    titotito
    committed
    Merge pull request kivy#177 from LogicalDash/igraph
    Fix bug in igraph recipe
    2 parents 6fcce61 + 4e295fd commit c87a33c

    File tree

    3 files changed

    +10
    -5
    lines changed

    3 files changed

    +10
    -5
    lines changed

    ‎recipes/igraph/get_platform.py

    Lines changed: 0 additions & 3 deletions
    This file was deleted.

    ‎recipes/igraph/recipe.sh

    Lines changed: 4 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    #!/bin/bash
    1+
    b#!/bin/bash
    22

    33
    # Recipe for the Python interface to igraph, a high-performance graph library in C: http://igraph.org/
    44
    #
    @@ -18,7 +18,7 @@ RECIPE_igraph=$RECIPES_PATH/igraph
    1818

    1919

    2020
    function prebuild_igraph() {
    21-
    patch setup.py $RECIPE_igraph/setup.py.patch
    21+
    true
    2222
    }
    2323

    2424
    function shouldbuild_igraph() {
    @@ -29,6 +29,8 @@ function shouldbuild_igraph() {
    2929

    3030
    function build_igraph() {
    3131
    cd $BUILD_igraph
    32+
    patch setup.py $RECIPE_igraph/setup.py.patch
    33+
    patch setup.cfg $RECIPE_igraph/setup.cfg.patch
    3234
    push_arm
    3335

    3436
    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

    ‎recipes/igraph/setup.cfg.patch

    Lines changed: 6 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,6 @@
    1+
    2,3c2,3
    2+
    < include_dirs = ../../build/include:../../include:/usr/local/include:/usr/include
    3+
    < library_dirs = ../../build/src/.libs:../../src/.libs:/usr/local/lib:/usr/lib
    4+
    ---
    5+
    > include_dirs = ../../build/include:../../include
    6+
    > library_dirs = ../../build/src/.libs:../../src/.libs

    0 commit comments

    Comments
     (0)
    0