Skip to content

Commit 8399be8

Browse files
committed
wip build sqlite3 python module;
1 parent cc574c6 commit 8399be8

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

pythonforandroid/recipes/python2/__init__.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,28 @@ def do_python_build(self, arch):
9797
if 'openssl' in self.ctx.recipe_build_order:
9898
file.writelines([
9999
'SSL=' + Recipe.get_recipe('openssl', self.ctx).get_build_dir(arch.arch) + '\n',
100-
'_ssl _ssl.c -DUSE_SSL',
100+
'_ssl',
101+
' _ssl.c',
102+
' -DUSE_SSL',
101103
' -I$(SSL)/include -I$(SSL)/include/openssl',
102104
' -L$(SSL) -lssl -lcrypto',
103105
'\n'])
104106
if 'sqlite3' in self.ctx.recipe_build_order:
105107
file.writelines([
106108
'SQLITE=' + Recipe.get_recipe('sqlite3', self.ctx).get_build_dir(arch.arch) + '\n',
107-
'sqlite3 sqlite3.c -DSQLITE_ENABLE_FTS4',
109+
'_sqlite3',
110+
' _sqlite/cache.c',
111+
' _sqlite/connection.c',
112+
' _sqlite/cursor.c',
113+
' _sqlite/microprotocols.c',
114+
' _sqlite/module.c',
115+
' _sqlite/prepare_protocol.c',
116+
' _sqlite/row.c',
117+
' _sqlite/statement.c',
118+
' _sqlite/util.c',
119+
' -DSQLITE_ENABLE_FTS4',
108120
' -I$(SQLITE)',
109-
' -L$(SQLITE)/obj/local/' + arch.arch + '/objs -lsqlite3',
121+
' -L$(SQLITE)/obj/local/' + arch.arch + ' -lsqlite3',
110122
'\n'])
111123
file.close()
112124

pythonforandroid/recipes/sqlite3/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import sh
44

55
class Sqlite3Recipe(NDKRecipe):
6-
version = '3.11.0'
6+
version = '3.11.1'
77
# Don't forget to change the URL when changing the version
8-
url = 'http://www.sqlite.com/2016/sqlite-amalgamation-3110000.zip'
8+
url = 'http://www.sqlite.com/2016/sqlite-amalgamation-3110100.zip'
99
generated_libraries = ['sqlite3']
1010

1111
def should_build(self, arch):

0 commit comments

Comments
 (0)