X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/d519a96dc82f9e0a582c63cb01c6bbd4585827e8..3152547b652eb11c598026d08277f048adcf3eb3:/packages/python/build.sh

diff --git a/packages/python/build.sh b/packages/python/build.sh
index a7a6b907..444580fb 100644
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@@ -2,12 +2,12 @@ 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"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil"
 TERMUX_PKG_HOSTBUILD=true
 
-_MAJOR_VERSION=3.4
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3
-TERMUX_PKG_BUILD_REVISION=4
+_MAJOR_VERSION=3.5
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
+TERMUX_PKG_BUILD_REVISION=3
 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.
@@ -18,7 +18,11 @@ 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"
+# 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* bin/pyvenv*"
 
 # Python does not use CPPFLAGS when building modules, so add this to CFLAGS as well (needed when building _cursesmodule):
@@ -39,6 +43,9 @@ termux_step_host_build () {
 
 termux_step_post_configure () {
 	cp $TERMUX_PKG_HOSTBUILD_DIR/Parser/pgen $TERMUX_PKG_BUILDDIR/Parser/pgen
+	cp $TERMUX_PKG_HOSTBUILD_DIR/Programs/_freeze_importlib $TERMUX_PKG_BUILDDIR/Programs/_freeze_importlib
+	$TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen
+	$TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/Programs/_freeze_importlib
 }
 
 termux_step_post_make_install () {
@@ -61,6 +68,7 @@ termux_step_post_make_install () {
 termux_step_post_massage () {
 	# Restore pyconfig.h saved away in termux_step_post_make_install() above:
 	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/python${_MAJOR_VERSION}m/
+	cp $TERMUX_PKG_TMPDIR/pyconfig.h $TERMUX_PREFIX/include/python${_MAJOR_VERSION}m/
 	mv $TERMUX_PKG_TMPDIR/pyconfig.h $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/python${_MAJOR_VERSION}m/
 
 	cd $TERMUX_PKG_MASSAGEDIR
@@ -69,15 +77,16 @@ 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:
 	echo "pip freeze 2> /dev/null | xargs pip uninstall -y > /dev/null 2> /dev/null" > prerm
 	# Cleanup __pycache__ folders
-	echo "rm -rf $TERMUX_PREFIX/lib/python3.4/" >> prerm
+	echo "rm -rf $TERMUX_PREFIX/lib/python${_MAJOR_VERSION}/" >> prerm
 	echo "rm -f $TERMUX_PREFIX/bin/pip $TERMUX_PREFIX/bin/pip3*" >> prerm
 	echo "exit 0" >> prerm