X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/13a414dd307b07fa4b0eedf478edba5fc13979ad..83d11d6e040761d0843585db4148153e040d4e87:/packages/python2/build.sh

diff --git a/packages/python2/build.sh b/packages/python2/build.sh
index 9609ff71..da86caae 100644
--- a/packages/python2/build.sh
+++ b/packages/python2/build.sh
@@ -4,11 +4,11 @@ TERMUX_PKG_DESCRIPTION="Python 2 programming language intended to enable clear p
 # 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, libsqlite, gdbm, ncurses-ui-libs"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt"
 TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=2.7
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.11
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.12
 TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
 
@@ -28,9 +28,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-unicode=ucs4"
 # Let 2to3 be in the python3 package:
 TERMUX_PKG_RM_AFTER_INSTALL="bin/2to3"
 
-# NOTE: termux_step_host_build may not be called if host build is cached.
-export TERMUX_ORIG_PATH=$PATH
-export PATH=$TERMUX_PKG_HOSTBUILD_DIR:$PATH
 termux_step_host_build () {
 	# We need a host-built Parser/pgen binary, copied into cross-compile build in termux_step_post_configure() below
 	$TERMUX_PKG_SRCDIR/configure
@@ -46,6 +43,12 @@ termux_step_post_configure () {
 	$TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen
 }
 
+termux_step_pre_configure() {
+	# Put the host-built python in path:
+	export TERMUX_ORIG_PATH=$PATH
+	export PATH=$TERMUX_PKG_HOSTBUILD_DIR:$PATH
+}
+
 termux_step_post_make_install () {
 	# Avoid file clashes with the python (3) package:
 	mv $TERMUX_PREFIX/share/man/man1/{python.1,python2.1}
@@ -61,17 +64,25 @@ termux_step_post_make_install () {
 termux_step_create_debscripts () {
 	## POST INSTALL:
 	echo "echo 'Setting up pip2...'" > postinst
+	# Fix historical mistake which removed bin/pip2 but left site-packages/pip-*.dist-info,
+	# which causes ensurepip to avoid installing pip due to already existing pip install:
+	echo "if [ ! -f $TERMUX_PREFIX/bin/pip2 -a -d $TERMUX_PREFIX/lib/python${_MAJOR_VERSION}/site-packages/pip-*.dist-info ]; then rm -Rf $TERMUX_PREFIX/lib/python${_MAJOR_VERSION}/site-packages/pip-*.dist-info ; fi" >> postinst
+	# Setup bin/pip2:
 	echo "$TERMUX_PREFIX/bin/python2 -m ensurepip --upgrade --no-default-pip" >> postinst
-	# Try to update pip, failing silently on e.g. network errors:
-	#echo "$TERMUX_PREFIX/bin/pip2 install --upgrade pip" >> postinst
-	echo "exit 0" >> postinst
 
 	## PRE RM:
-	echo "pip2 freeze 2> /dev/null | xargs pip2 uninstall -y > /dev/null 2> /dev/null" > prerm
+	# Avoid running on update:
+	echo 'if [ $1 != "remove" ]; then exit 0; fi' > prerm
+	# Uninstall everything installed through pip:
+	echo "pip2 freeze 2> /dev/null | xargs pip2 uninstall -y > /dev/null 2> /dev/null" >> prerm
 	# Cleanup __pycache__ folders
-	echo "rm -rf $TERMUX_PREFIX/lib/python${_MAJOR_VERSION}/" >> prerm
+	echo "find $TERMUX_PREFIX/lib/python${_MAJOR_VERSION} -depth -name __pycache__ -exec rm -rf {} \;" >> prerm
+	# Remove contents of site-packages/ folder:
+	echo "rm -Rf $TERMUX_PREFIX/lib/python${_MAJOR_VERSION}/site-packages/*" >> prerm
+	# Remove bin/pip2* installed by ensurepip in postinst:
 	echo "rm -f $TERMUX_PREFIX/bin/pip2*" >> prerm
-	echo "exit 0" >> prerm
 
+	echo "exit 0" >> postinst
+	echo "exit 0" >> prerm
 	chmod 0755 postinst prerm
 }