Skip to content

Commit 69204d7

Browse files
committed
fix quotes;
try other route with patch;
1 parent 07cc5b7 commit 69204d7

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

pythonforandroid/recipes/python2/__init__.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ def do_python_build(self, arch):
104104
' -L$(SSL) -lssl -lcrypto',
105105
'\n'])
106106
if 'sqlite3' in self.ctx.recipe_build_order:
107+
#self.apply_patch('patches/enable-sqlite3.patch', arch.arch)
108+
#sqlite3_root = Recipe.get_recipe('sqlite3', self.ctx).get_build_dir(arch.arch)
109+
#shprint(sh.sed, '-i', 's#SQLITE_RECIPE_INC#{}#'.format(sqlite3_root),
110+
# join(self.get_build_dir(arch.arch), 'setup.py'))
111+
#shprint(sh.sed, '-i', 's#SQLITE_RECIPE_LIB#{}#'.format(
112+
# join(sqlite3_root, 'obj/local', arch.arch)),
113+
# join(self.get_build_dir(arch.arch), 'setup.py'))
114+
107115
file.writelines([
108116
'SQLITE=' + Recipe.get_recipe('sqlite3', self.ctx).get_build_dir(arch.arch) + '\n',
109117
'_sqlite3',
@@ -117,11 +125,12 @@ def do_python_build(self, arch):
117125
' _sqlite/util.c',
118126
' _sqlite/row.c',
119127
' -DSQLITE_ENABLE_FTS4',
120-
#' -DMODULE_NAME _sqlite3',
128+
' -D\'MODULE_NAME="_sqlite3"\'',
121129
' -I$(SQLITE)',
122130
' -L$(SQLITE)/obj/local/' + arch.arch + ' -lsqlite3',
123131
#' -o_sqlite/',
124132
'\n'])
133+
125134
file.close()
126135

127136
configure = sh.Command('./configure')
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- python2/setup.py 2016-03-22 16:57:59.263200138 +0100
2+
+++ python2-patch/setup.py 2016-03-22 17:15:23.166433004 +0100
3+
@@ -1024,7 +1024,8 @@
4+
5+
# We hunt for #define SQLITE_VERSION "n.n.n"
6+
# We need to find >= sqlite version 3.0.8
7+
- sqlite_incdir = sqlite_libdir = None
8+
+ sqlite_incdir = 'SQLITE_RECIPE_INC'
9+
+ sqlite_libdir = 'SQLITE_RECIPE_LIB'
10+
sqlite_inc_paths = [ '/usr/include',
11+
'/usr/include/sqlite',
12+
'/usr/include/sqlite3',

0 commit comments

Comments
 (0)