Merge pull request #3 from GRRedWings/NDK-16b

Ndk 16b

Makefile

@@ -37,31 +37,31 @@ $(eval $(call formula,python,3.5.1))
 python_modules: $(foreach mod,$(subst ',,$(PYTHON_OPTIONAL_MODULES)),python_$(mod))
 
 # Python lzma support.
-$(eval $(call formula,xz,5.2.1))
+$(eval $(call formula,xz,5.2.3))
 python_lzma: xz
 
 # Python bzip2 support.
 $(eval $(call formula,bzip2,1.0.6))
 python_bz2: bzip2
 
 # Python readline support.
-$(eval $(call formula,readline,6.3))
+$(eval $(call formula,readline,7.0))
 python_readline: readline
 
 # Python SSL support.
 $(eval $(call formula,openssl,1.0.2k))
 python_ssl: openssl
 
 # Python curses support.
-$(eval $(call formula,ncurses,5.9))
+$(eval $(call formula,ncurses,6.0))
 python_curses: ncurses
 
 # Python SQLite support.
-$(eval $(call formula,sqlite,3.8.10.2))
+$(eval $(call formula,sqlite,3.21.0))
 python_sqlite3: sqlite
 
 # Python (g)dbm support.
-$(eval $(call formula,gdbm,1.11))
+$(eval $(call formula,gdbm,1.14))
 python_gdbm: gdbm
 
 

env

@@ -6,7 +6,7 @@ export ANDROID_TOOL_PREFIX="${BASE}/build-tools"
 export ANDROID_TEST_PREFIX="${BASE}/build-vm"
 
 # SDKs and target platforms.
-export NDK_REV=15b
+export NDK_REV=16b
 export SDK_REV=25.2.4
 export NDK_REL=android-ndk-r${NDK_REV}
 export SDK_REL=android-sdk-r${SDK_REV}

mk/build_single.sh

@@ -17,7 +17,7 @@ export cross="${ANDROID_TARGET}-"
 
 
 case "${NDK_REV}" in
-  15*)
+  [15-16]*)
       export CFLAGS="--sysroot ${TOOL_PREFIX}/sysroot -I${TOOL_PREFIX}/include -DANDROID -mandroid ${CFLAGS_EXTRA} -isystem ${TOOL_PREFIX}/sysroot/usr/include/${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API_LEVEL}" 
       ;;
   *)

mk/gdbm/1.14/gdbm-1.14-android-winsize.patch

@@ -0,0 +1,12 @@
+diff -ru gdbm-1.14/src/gdbmtool.c gdbm-1.14-android/src/gdbmtool.c
+--- gdbm-1.14/src/gdbmtool.c	2013-05-21 21:48:31.000000000 +0200
++++ gdbm-1.14-android/src/gdbmtool.c	2014-08-05 15:35:51.000000000 +0200
+@@ -302,7 +302,7 @@
+ int
+ get_screen_lines ()
+ {
+-#ifdef TIOCGWINSZ
++#if defined(TIOCGWINSZ) && !__ANDROID__
+   if (isatty (1))
+     {
+       struct winsize ws;

mk/gdbm/1.14/sources.txt

@@ -0,0 +1 @@
+https://ftp.gnu.org/gnu/gdbm/gdbm-1.14.tar.gz

mk/ncurses/5.9/ncurses-5.9-android-locale-fixes.patch → mk/ncurses/6.0/ncurses-6.0-android-locale-fixes.patch

@@ -1,6 +1,6 @@
-diff -ru ncurses-5.9/form/fty_num.c ncurses-5.9-android/form/fty_num.c
---- ncurses-5.9/form/fty_num.c	2010-01-23 22:14:36.000000000 +0100
-+++ ncurses-5.9-android/form/fty_num.c	2014-08-04 23:04:23.000000000 +0200
+diff -ru ncurses-6.0/form/fty_num.c ncurses-6.0-android/form/fty_num.c
+--- ncurses-6.0/form/fty_num.c	2010-01-23 22:14:36.000000000 +0100
++++ ncurses-6.0-android/form/fty_num.c	2014-08-04 23:04:23.000000000 +0200
 @@ -40,7 +40,7 @@
  #include <locale.h>
  #endif

mk/ncurses/6.0/sources.txt

@@ -0,0 +1 @@
+https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz

mk/readline/7.0/sources.txt

@@ -0,0 +1 @@
+https://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz

mk/sqlite/3.21.0/sources.txt

@@ -0,0 +1 @@
+https://www.sqlite.org/2017/sqlite-autoconf-3210000.tar.gz

mk/xz/5.2.3/sources.txt

@@ -0,0 +1 @@
+http://tukaani.org/xz/xz-5.2.3.tar.xz

mk/xz/5.2.3/xz-5.2.3-disable-so-versioning.patch

@@ -0,0 +1,25 @@
+diff -Nru xz-5.2.3-old/src/liblzma/Makefile.am xz-5.2.3/src/liblzma/Makefile.am
+--- xz-5.2.3-old/src/liblzma/Makefile.am	2015-07-21 14:35:24.124356586 +0000
++++ xz-5.2.3/src/liblzma/Makefile.am	2015-07-21 14:36:25.768356450 +0000
+@@ -24,7 +24,7 @@
+ 	-I$(top_srcdir)/src/liblzma/simple \
+ 	-I$(top_srcdir)/src/common \
+ 	-DTUKLIB_SYMBOL_PREFIX=lzma_
+-liblzma_la_LDFLAGS = -no-undefined -version-info 7:3:2
++liblzma_la_LDFLAGS = -no-undefined -version-info 7:3:2 -avoid-version
+
+ EXTRA_DIST += liblzma.map validate_map.sh
+ if COND_SYMVERS
+diff -Nru xz-5.2.3-old/src/liblzma/Makefile.in xz-5.2.3/src/liblzma/Makefile.in
+--- xz-5.2.3-old/src/liblzma/Makefile.in	2015-07-21 14:35:24.124356586 +0000
++++ xz-5.2.3/src/liblzma/Makefile.in	2015-07-21 14:37:15.412356340 +0000
+@@ -750,7 +750,7 @@
+ 	-I$(top_srcdir)/src/common \
+ 	-DTUKLIB_SYMBOL_PREFIX=lzma_
+
+-liblzma_la_LDFLAGS = -no-undefined -version-info 7:3:2 $(am__append_1) \
++liblzma_la_LDFLAGS = -no-undefined -version-info 7:3:2 -avoid-version $(am__append_1) \
+ 	$(am__append_42)
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = liblzma.pc
+