r32 as Python 3.6.2

- change revision number to r32.
- check development tools in Makefile.
- build succeed, but not tested with actual android devices.
- reverted patch removed in 'Python/fileutils.c'
- sysconfig file name was changed with empty platform string. (locale.patch)
- disable Py_ASSERT in 'Modules/posixmodule.c'.
- remove the not used file: Python-3.2.2-android.patch.

Author: kuri65536

python3-alpha/LATEST_VERSION

@@ -1 +1 @@
-r31
+r32

python3-alpha/LATEST_VERSION_EXTRA

@@ -1 +1 @@
-r31
+r32

python3-alpha/LATEST_VERSION_SCRIPTS

@@ -1 +1 @@
-r31
+r32

python3-alpha/Makefile

@@ -7,7 +7,7 @@
 # build settings section 1 {{{1
 VER_MAJ=3.6
 VER_MAJ_NODOT=$(subst .,,$(VER_MAJ))
-VERSION=$(VER_MAJ).0
+VERSION=$(VER_MAJ).2
 # set -ex
 CWD := $(shell pwd)
 DEBUG=no
@@ -39,13 +39,22 @@ endif
 ifeq (x$(NDK_PATH),x)
 build: error
 else
-build: $(ZIP)
+build: .build_tools $(ZIP)
 endif
 
 error:
 	@echo please set NDK_PATH to android-ndk-r10d or later::
 	@echo "  $$ NDK_PATH=/path/to/android-ndk-r10d make build"
 
+.build_tools:
+	@echo "check zlib,               if failed: apt install zlib-dev"
+	python ../tools/check_zlib.py
+	@echo "check makedepend command, if failed: apt install xutils-dev"
+	makedepend
+	@echo "check zip command,        if failed: apt install zip"
+	zip -v > /dev/null 2>&1
+	touch .build_tools
+
 # tools {{{2
 ndk_depends = $(NDK_PATH)/ndk-depends
 TAR := tar xfz
@@ -301,8 +310,8 @@ $(PYTHONTAR):
 	make -C host-src Parser/pgen
 	make -C host-src install
 	cp host-src/Parser/pgen $(HOSTPYTHON)/bin/hostpgen
-	cp host-src/Programs/_freeze_importlib \
-	    $(HOSTPYTHON)/bin/host_freeze_importlib
+	# cp host-src/Programs/_freeze_importlib \
+	#     $(HOSTPYTHON)/bin/host_freeze_importlib
 	touch .build_host
 
 # python3: patching-configure-build {{{1
@@ -444,3 +453,4 @@ localinstall:
 	adb push $(ZIPSCRIPTS) $(andpath)
 
 # vi: ft=Makefile:fdm=marker
+# DO NOT DELETE

python3-alpha/Python-3.2.2-android.patch

@@ -120,10 +120,10 @@ $(OPENSSL_BIN_x86): .build_x86/Makefile
 .build_x86/Makefile: $(OPENSSL_SRC)
 	rm -rf $(dir $@)
 	tar xfz $(OPENSSL_SRC)
-	mv $(OPENSSL_DIR) $(dir $@)
+	mv $(OPENSSL_DIR) $(subst /,,$(dir $@))
 
 .build_armeabi/Makefile: $(OPENSSL_SRC)
 	rm -rf $(dir $@)
 	tar xfz $(OPENSSL_SRC)
-	mv $(OPENSSL_DIR) $(dir $@)
+	mv $(OPENSSL_DIR) $(subst /,,$(dir $@))
 

python3-alpha/openssl/Makefile

@@ -1,5 +1,5 @@
---- python-src_arm/build/lib.linux-arm-3.6/_sysconfigdata_m_linux_arm-linux-androideabi.py	2017-01-20 04:10:36.871532034 +0900
-+++ host/lib/python3.6/_sysconfigdata_m_linux_arm-linux-androideabi.py	2017-01-20 04:13:45.625071251 +0900
+--- python-src_arm/build/lib.linux-arm-3.6/_sysconfigdata_m_linux_.py	2017-01-20 04:10:36.871532034 +0900
++++ host/lib/python3.6/_sysconfigdata_m_linux_.py	2017-01-20 04:13:45.625071251 +0900
 @@ -109,6 +109,7 @@
   'ENSUREPIP': 'no',
   'EXE': '',

python3-alpha/patches/_sysconfigdata-linux-arm.patch

@@ -1,5 +1,5 @@
---- python-src_x86/build/lib.linux-i686-3.6/_sysconfigdata_m_linux_i686-linux-android.py	2017-01-20 07:46:04.726217475 +0900
-+++ host/lib/python3.6/_sysconfigdata_m_linux_i686-linux-android.py	2017-01-20 07:55:21.667754773 +0900
+--- python-src_x86/build/lib.linux-i686-3.6/_sysconfigdata_m_linux_.py	2017-01-20 07:46:04.726217475 +0900
++++ host/lib/python3.6/_sysconfigdata_m_linux_.py	2017-01-20 07:55:21.667754773 +0900
 @@ -109,6 +109,7 @@
   'ENSUREPIP': 'no',
   'EXE': '',

python3-alpha/patches/_sysconfigdata-linux-i686.patch

@@ -102,24 +102,6 @@ diff -ru Python-3.3.5/Python/fileutils.c Python-3.3.5-android/Python/fileutils.c
  extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size);
  #endif
 
-@@ -44,7 +44,7 @@
-     Py_RETURN_NONE;
- }
-
--#if !defined(__APPLE__) && !defined(MS_WINDOWS)
-+#if !defined(__APPLE__) && !defined(__ANDROID__) && !defined(MS_WINDOWS)
- extern int _Py_normalize_encoding(const char *, char *, size_t);
-
- /* Workaround FreeBSD and OpenIndiana locale encoding issue with the C locale.
-@@ -194,7 +194,7 @@
- }
- #endif   /* !defined(__APPLE__) && !defined(MS_WINDOWS) */
-
--#if !defined(__APPLE__) && (!defined(MS_WINDOWS) || !defined(HAVE_MBRTOWC))
-+#if !defined(__APPLE__) && !defined(__ANDROID__) && (!defined(MS_WINDOWS) || !defined(HAVE_MBRTOWC))
- static wchar_t*
- decode_ascii_surrogateescape(const char *arg, size_t *size)
- {
 @@ -241,7 +241,7 @@
  wchar_t*
  _Py_char2wchar(const char* arg, size_t *size)

python3-alpha/patches/python-3.4.2-android-locale.patch

@@ -0,0 +1,23 @@
+--- host-src/Modules/posixmodule.c	2017-07-08 12:33:27.000000000 +0900
++++ python-src_arm/Modules/posixmodule.c	2017-08-31 16:04:39.609134000 +0900
+@@ -416,6 +416,11 @@
+ }
+ #endif
+ 
++/* Android doesn't expose AT_EACCESS - manually define it. */
++#if !defined(AT_EACCESS) && defined(__ANDROID__)
++#define AT_EACCESS     0x200
++#endif
++
+ 
+ #ifndef MS_WINDOWS
+ PyObject *
+@@ -1937,7 +1942,7 @@
+     PyStructSequence_SET_ITEM(v, 1,
+                               PyLong_FromUnsignedLongLong(st->st_ino));
+ #else
+-    Py_BUILD_ASSERT(sizeof(unsigned long) >= sizeof(st->st_ino));
++    // Py_BUILD_ASSERT(sizeof(unsigned long) >= sizeof(st->st_ino));
+     PyStructSequence_SET_ITEM(v, 1, PyLong_FromUnsignedLong(st->st_ino));
+ #endif
+ #ifdef MS_WINDOWS