Skip to content

Update recipes sqlite3 to 3.15.1 and apsw to 3.15.0-r1 both with FTS4 enabled #936

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 1 commit into from
Nov 26, 2016
Merged

Update recipes sqlite3 to 3.15.1 and apsw to 3.15.0-r1 both with FTS4 enabled #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pythonforandroid/recipes/apsw/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sh

class ApswRecipe(PythonRecipe):
version = '3.11.1-r1'
version = '3.15.0-r1'
url = 'https://github.com/rogerbinns/apsw/archive/{version}.tar.gz'
depends = ['sqlite3', 'hostpython2', 'python2', 'setuptools']
call_hostpython_via_targetpython = False
Expand All @@ -17,7 +17,7 @@ def build_arch(self, arch):
shprint(hostpython,
'setup.py',
'build_ext',
'--enable=fts3'
'--enable=fts4'
, _env=env)
# Install python bindings
super(ApswRecipe, self).build_arch(arch)
Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/sqlite3/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ LOCAL_SRC_FILES := sqlite3.c

LOCAL_MODULE := sqlite3

LOCAL_CFLAGS := -DSQLITE_ENABLE_FTS3
LOCAL_CFLAGS := -DSQLITE_ENABLE_FTS4

include $(BUILD_SHARED_LIBRARY)
4 changes: 2 additions & 2 deletions pythonforandroid/recipes/sqlite3/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import sh

class Sqlite3Recipe(NDKRecipe):
version = '3.12.2'
version = '3.15.1'
# Don't forget to change the URL when changing the version
url = 'https://www.sqlite.org/2016/sqlite-amalgamation-3120200.zip'
url = 'https://www.sqlite.org/2016/sqlite-amalgamation-3150100.zip'
generated_libraries = ['sqlite3']

def should_build(self, arch):
Expand Down