Skip to content

Commit e64a7c2

Browse files
committed
Merge branch 'cookbook' of https://github.com/lfdversluis/python-for-android into cookbook
2 parents 2222ff5 + a1af19a commit e64a7c2

File tree

7 files changed

+4
-81
lines changed

7 files changed

+4
-81
lines changed
-7.18 MB
Binary file not shown.
-7.21 MB
Binary file not shown.

recipes/libtorrent/config.patch

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

recipes/libtorrent/file.patch

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

recipes/libtorrent/libtorrent.so

60.3 MB
Binary file not shown.

recipes/libtorrent/recipe.sh

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
VERSION_libtorrent=${VERSION_libtorrent:-0.16.16}
55

66
# dependencies of this recipe
7-
DEPS_libtorrent=()
7+
DEPS_libtorrent=(python)
88

99
# url of the package
1010
URL_libtorrent=http://downloads.sourceforge.net/project/libtorrent/libtorrent/libtorrent-rasterbar-${VERSION_libtorrent}.tar.gz
@@ -21,27 +21,14 @@ RECIPE_libtorrent=$RECIPES_PATH/libtorrent
2121
# function called for preparing source code if needed
2222
# (you can apply patch etc here.)
2323
function prebuild_libtorrent() {
24-
#patch ${BUILD_libtorrent}/include/libtorrent/config.hpp < ${RECIPE_libtorrent}/config.patch
25-
#patch ${BUILD_libtorrent}/src/file.cpp < ${RECIPE_libtorrent}/file.patch
26-
#patch ${BUILD_libtorrent}/src/utp_stream.cpp < ${RECIPE_libtorrent}/utp_stream.patch
24+
true
2725
}
2826

2927
# function called to build the source code
3028
function build_libtorrent() {
3129

32-
# Build using bjam with boost statically linked
33-
cd $BUILD_libtorrent/bindings/python
34-
export BOOST_ROOT=$BUILD_boost
35-
export BOOST_BUILD_PATH=${BUILD_boost}/tools/build/v2
36-
#$BUILD_boost/b2 gcc-androidR9 release need-librt=no dht-support=on boost=source link=static geoip=off boost-link=static asserts=off threading=single
37-
38-
cp $RECIPE_libtorrent/armeabi/libtorrent.so $BUILD_PATH/python-install/lib/python2.7/site-packages/libtorrent.so
39-
# Build using automake
40-
#BOOSTANDROID=/home/rolf/Projects/Android/tordroid/boostandroid
41-
#cd $BUILD_libtorrent
42-
#push_arm
43-
#./configure --enable-python-binding --host=arm-linux-gnueabi --with-boost=${BOOSTANDROID}/build
44-
#pop_arm
30+
# Copy the prebuilt libtorrent.so to the python's packages, so it can be imported
31+
try cp $RECIPE_libtorrent/libtorrent.so $BUILD_PATH/python-install/lib/python2.7/site-packages/libtorrent.so
4532

4633
}
4734

recipes/libtorrent/utp_stream.patch

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

0 commit comments

Comments
 (0)