Ndk 14b

LICENSE

@@ -1,14 +1,202 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
 
- Copyright (C) 2004 Sam Hocevar <[email protected]>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+   1. Definitions.
 
-  0. You just DO WHAT THE FUCK YOU WANT TO.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Makefile

@@ -4,7 +4,7 @@ all: build
 
 # Get configuration.
 mk/env.mk: env
-	@bash --noprofile --norc -c 'source ./env; set -o posix; set' | egrep '^(ANDROID|SDK|NDK|BUILD|TEST|PYTHON)_' > $@
+	@bash --noprofile --norc -c 'source ./env; set -o posix; set' | egrep '^(ANDROID|SDK|NDK|BUILD|TEST|PYTHON|SOURCES)_' > $@
 -include mk/env.mk
 
 # A formula.
@@ -13,7 +13,11 @@ $1: $1-$2
 
 $1-$2: ndk $3
 	$$(info Checking $1 $2 sources...)
+ifeq ($(SOURCES_LOCAL),1)
+	@wget -N -P "src/" -i "mk/$1/$2/sources-local.txt"
+else
 	@wget -N -P "src/" -i "mk/$1/$2/sources.txt"
+endif
 ifeq ("$$(wildcard build/.built-$(BUILD_IDENTIFIER)/$1-$2)","")
 	$$(info Building $1 $2...)
 	@bash --noprofile --norc mk/build_single.sh $1 $2
@@ -27,7 +31,7 @@ endef
 build: python_modules python
 
 # Main Python.
-$(eval $(call formula,python,3.4.3))
+$(eval $(call formula,python,3.5.1))
 
 # Optional Python modules.
 python_modules: $(foreach mod,$(subst ',,$(PYTHON_OPTIONAL_MODULES)),python_$(mod))
@@ -45,7 +49,7 @@ $(eval $(call formula,readline,6.3))
 python_readline: readline
 
 # Python SSL support.
-$(eval $(call formula,openssl,1.0.2d))
+$(eval $(call formula,openssl,1.0.2e))
 python_ssl: openssl
 
 # Python curses support.

env

@@ -6,15 +6,30 @@ export ANDROID_TOOL_PREFIX="${BASE}/build-tools"
 export ANDROID_TEST_PREFIX="${BASE}/build-vm"
 
 # SDKs and target platforms.
-export NDK_REL=android-ndk-r10d
-export SDK_REL=android-sdk-r24.0.2
-export NDK_REV=10d
-export SDK_REV=24.0.2
-export ANDROID_API_LEVEL=21
+export NDK_REV=14b
+export SDK_REV=25.2.4
+export NDK_REL=android-ndk-r${NDK_REV}
+export SDK_REL=android-sdk-r${SDK_REV}
+# For Honeywell, we can not go above 23
+# For Zebra we can not go above 22
+export ANDROID_API_LEVEL=22
 export ANDROID_PLATFORM=arm
+#export ANDROID_PLATFORM=arm64
+#export ANDROID_PLATFORM=x86
 export ANDROID_COMPILER=4.9
+
+case "${NDK_REV}" in
+  10*)
+    export ANDROID_COMPILER64=clang3.6
+    ;;
+  *)
+    export ANDROID_COMPILER64=4.9
+    ;;
+esac
+
 export ANDROID_HOST=x86_64-pc-linux-gnu
 export ANDROID_AGREE_LICENSE_TERMS=n
+export SOURCES_LOCAL=0
 
 # Testing.
 export ANDROID_VM_NAME=PythonTesting
@@ -46,6 +61,10 @@ case "${ANDROID_PLATFORM}" in
       export ANDROID_TARGET=arm-linux-androideabi
       export ANDROID_TOOLCHAIN="arm-linux-androideabi-${ANDROID_COMPILER}"
       ;;
+  arm64)
+      export ANDROID_TARGET=aarch64-linux-android
+      export ANDROID_TOOLCHAIN="aarch64-linux-android-${ANDROID_COMPILER64}"
+      ;;
   mips)
       export ANDROID_TARGET=mipsel-linux-android
       export ANDROID_TOOLCHAIN="mipsel-linu-android-${ANDROID_COMPILER}"
@@ -61,3 +80,4 @@ case "${ANDROID_PLATFORM}" in
 esac
 export BUILD_IDENTIFIER="${NDK_REV}-${ANDROID_API_LEVEL}-${ANDROID_TOOLCHAIN}"
 export TEST_IDENTIFIER="${SDK_REV}-${ANDROID_API_LEVEL}-${ANDROID_PLATFORM}"
+

mk/build_ndk.sh

@@ -31,15 +31,15 @@ case "${NDK_REV}" in
       fi
       ;;
   *)
-      NDK_ARCHIVE="$BASE/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}.tar.bz2"
+      NDK_ARCHIVE="${BASE}/sdk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z]')-${NDK_ARCH}"
       if [[ ! -d "${BASE}/sdk/${NDK_REL}" ]]; then
-           # Tar archive.
-           tar -xf "${NDK_ARCHIVE}" -C "${BASE}/sdk" || exit 1
+           # Zip archive
+           unzip "${NDK_ARCHIVE}" -d "${BASE}/sdk" || exit 1
       fi
       ;;
 esac
 
 if [[ ! -f "${ANDROID_PREFIX}/.built-ndk-${BUILD_IDENTIFIER}" ]]; then
-    ("${BASE}/sdk/${NDK_REL}/build/tools/make-standalone-toolchain.sh" --platform="android-${ANDROID_API_LEVEL}" --install-dir="${ANDROID_TOOL_PREFIX}/${BUILD_IDENTIFIER}" --toolchain="${ANDROID_TOOLCHAIN}" &&\
+    ("${BASE}/sdk/${NDK_REL}/build/tools/make-standalone-toolchain.sh" --force --platform="android-${ANDROID_API_LEVEL}" --install-dir="${ANDROID_TOOL_PREFIX}/${BUILD_IDENTIFIER}" --toolchain="${ANDROID_TOOLCHAIN}" &&\
      touch "${ANDROID_PREFIX}/.built-ndk-${BUILD_IDENTIFIER}") || exit 1
 fi

mk/bzip2/1.0.6/sources-local.txt

@@ -0,0 +1 @@
+http://artifactory.ops.cld/artifactory/ThirdParty/COTS/bzip/bzip2/1.0.6/bzip2-1.0.6.tar.gz

mk/gdbm/1.11/sources-local.txt

@@ -0,0 +1 @@
+http://artifactory.ops.cld/artifactory/ThirdParty/COTS/gdbm/1.11/gdbm-1.11.tar.gz

mk/ncurses/5.9/sources-local.txt

@@ -0,0 +1 @@
+http://artifactory.ops.cld/artifactory/ThirdParty/COTS/ncurses/5.9/ncurses-5.9.tar.gz

mk/ndk_source.sh

@@ -20,8 +20,20 @@ case "${NDK_REV}" in
       NDK_EXT=bin
       ;;
   *)
-      NDK_EXT=tar.bz2
+      NDK_EXT=zip
       ;;
 esac
 
-echo http://dl.google.com/android/ndk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z'])-${NDK_ARCH}.${NDK_EXT}
+if [ $SOURCES_LOCAL = 1 ]
+then
+  echo http://artifactory.ops.cld/artifactory/ThirdParty/COTS/android/android-ndk/r${NDK_REV}/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z'])-${NDK_ARCH}.${NDK_EXT}
+else
+  case "${NDK_REV}" in
+    10*)
+        echo http://dl.google.com/android/ndk/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z'])-${NDK_ARCH}.${NDK_EXT}
+        ;;
+    *)
+        echo http://dl.google.com/android/repository/android-ndk-r${NDK_REV}-$(uname -s | tr '[A-Z]' '[a-z'])-${NDK_ARCH}.${NDK_EXT}
+        ;;
+  esac 
+fi

mk/openssl/1.0.2e/sources-local.txt

@@ -0,0 +1 @@
+http://artifactory.ops.cld/artifactory/ThirdParty/COTS/openssl/1.0.2e/openssl-1.0.2e.tar.gz

mk/openssl/1.0.2e/sources.txt

@@ -0,0 +1 @@
+http://artfiles.org/openssl.org/source/old/1.0.2/openssl-1.0.2e.tar.gz

mk/python/3.4.3/build.sh → mk/python/3.5.1/build.sh

@@ -19,8 +19,10 @@ patch -p1  < "${FILESDIR}/${PACKAGE}-cross-compile.patch" || exit 1
 patch -p1  < "${FILESDIR}/${PACKAGE}-python-misc.patch" || exit 1
 patch -p1  < "${FILESDIR}/${PACKAGE}-android-locale.patch" || exit 1
 patch -Ep1 < "${FILESDIR}/${PACKAGE}-android-libmpdec.patch" || exit 1
-[[ "${NDK_REV}" != 10* ]] && (patch -p1 < "${FILESDIR}/${PACKAGE}-android-missing-getdents64-definition.patch" || exit 1)
 patch -p1  < "${FILESDIR}/${PACKAGE}-android-misc.patch" || exit 1
+#patch -p1  < "${FILESDIR}/${PACKAGE}-android-print.patch" || exit 1
+patch -p1  < "${FILESDIR}/${PACKAGE}-android-extras.patch" || exit 1
+#patch -p1  < "${FILESDIR}/${PACKAGE}-accept4.patch" || exit 1
 
 ./configure CROSS_COMPILE_TARGET=yes HOSTPYTHON="$(pwd)/hostpython" CONFIG_SITE=config.site --prefix="${PREFIX}" --host="${TARGET}" --build="${HOST}" --disable-ipv6 --enable-shared --without-ensurepip || exit 1
 make CROSS_COMPILE_TARGET=yes HOSTPYTHON="$(pwd)/hostpython" HOSTPGEN="$(pwd)/Parser/hostpgen" || exit 1

mk/python/3.5.1/python-3.5.1-accept4.patch

@@ -0,0 +1,11 @@
+--- Python-3.5.1/Modules/socketmodule.c	2016-10-20 11:06:38.170393614 -0400
++++ Python-3.5.1-android/Modules/socketmodule.c	2016-10-20 11:47:06.018345261 -0400
+@@ -421,6 +421,8 @@
+ #define INADDR_NONE (-1)
+ #endif
+
++#undef HAVE_ACCEPT4
++
+ /* XXX There's a problem here: *static* functions are not supposed to have
+    a Py prefix (or use CapitalizedWords).  Later... */
+

mk/python/3.5.1/python-3.5.1-android-extras.patch

@@ -0,0 +1,7 @@
+--- ./config.site	2017-01-16 13:05:00.374771609 -0500
++++ ./config.new.site	2017-01-16 13:03:16.482767000 -0500
+@@ -1,2 +1,3 @@
+ ac_cv_file__dev_ptmx=no
+ ac_cv_file__dev_ptc=no
++ac_cv_func_wcsftime=no
+