X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/8bdc9f3a8fa8666842f488f8c1c0e8f8cd39f56e..82fa5102639348e9f4cfcde37f2f1b0cf5b953c2:/packages/python/build.sh?ds=sidebyside

diff --git a/packages/python/build.sh b/packages/python/build.sh
index 0fc70583..390c8a79 100644
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@@ -1,12 +1,15 @@
 TERMUX_PKG_HOMEPAGE=http://python.org/
-TERMUX_PKG_DESCRIPTION="Programming language intended to enable clear programs on both a small and large scale"
-# lib/python3.4/lib-dynload/_ctypes.cpython-34m.so links to ffi
-# openssl for ensurepip
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil"
+TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear programs"
+# lib/python3.4/lib-dynload/_ctypes.cpython-34m.so links to ffi.
+# openssl for ensurepip.
+# libbz2 for the bz2 module.
+# ncurses-ui-libs for the curses.panel module.
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, liblzma, libsqlite, gdbm, ncurses-ui-libs, libcrypt"
 TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=3.5
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
+TERMUX_PKG_BUILD_REVISION=6
 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
 
 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.
@@ -17,8 +20,12 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_ftime=no"
 # Avoid trying to use AT_EACCESS which is not defined:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_faccessat=no"
+# The gethostbyname_r function does not exist on device libc:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_gethostbyname_r=no"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_HOST_TUPLE --disable-ipv6 --with-system-ffi --without-ensurepip"
-TERMUX_PKG_RM_AFTER_INSTALL="lib/python${_MAJOR_VERSION}/test lib/python${_MAJOR_VERSION}/tkinter lib/python${_MAJOR_VERSION}/turtledemo lib/python${_MAJOR_VERSION}/idlelib bin/python${_MAJOR_VERSION}m bin/python*-config bin/idle* bin/pyvenv*"
+# Hard links does not work on Android 6:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_linkat=no"
+TERMUX_PKG_RM_AFTER_INSTALL="lib/python${_MAJOR_VERSION}/test lib/python${_MAJOR_VERSION}/tkinter lib/python${_MAJOR_VERSION}/turtledemo lib/python${_MAJOR_VERSION}/idlelib bin/python${_MAJOR_VERSION}m bin/python*-config bin/idle*"
 
 # Python does not use CPPFLAGS when building modules, so add this to CFLAGS as well (needed when building _cursesmodule):
 # export CFLAGS="$CFLAGS -isystem $TERMUX_PREFIX/include/libandroid-support"
@@ -72,9 +79,10 @@ termux_step_post_massage () {
 
 termux_step_create_debscripts () {
 	## POST INSTALL:
-	echo "$TERMUX_PREFIX/bin/python -m ensurepip --default-pip > /dev/null" > postinst
+	echo 'echo "Setting up pip..."' > postinst
+	echo "$TERMUX_PREFIX/bin/python -m ensurepip --upgrade --default-pip" >> postinst
 	# Try to update pip, failing silently on e.g. network errors:
-	echo "$TERMUX_PREFIX/bin/pip install --upgrade pip > /dev/null 2> /dev/null" >> postinst
+	# echo "$TERMUX_PREFIX/bin/pip install --upgrade pip > /dev/null 2> /dev/null" >> postinst
 	echo "exit 0" >> postinst
 
 	## PRE RM: