X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/72f69cdc35d351db485f2021d9a98d4101e88bc8..a31d24ecfa791e16e3c3396b64369f56af7cf2a6:/packages/python/build.sh

diff --git a/packages/python/build.sh b/packages/python/build.sh
index c597d38f..59d16c8a 100644
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@@ -1,16 +1,10 @@
-TERMUX_PKG_HOMEPAGE=http://python.org/
+TERMUX_PKG_HOMEPAGE=https://python.org/
 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, libsqlite, gdbm, ncurses-ui-libs, libcrypt, liblzma"
-TERMUX_PKG_HOSTBUILD=true
-
 _MAJOR_VERSION=3.6
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
-TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.4
+TERMUX_PKG_SHA256=159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba
+TERMUX_PKG_SRCURL=https://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.
 # Set ac_cv_func_wcsftime=no to avoid errors such as "character U+ca0025 is not in range [U+0000; U+10ffff]"
@@ -29,43 +23,28 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_linkat=no"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_posix_semaphores_enabled=no"
 # Do not assume getaddrinfo is buggy when cross compiling:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_buggy_getaddrinfo=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/idle*"
-
-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
-	make Parser/pgen
-        # We need a python$_MAJOR_VERSION binary to be picked up by configure check:
-	make
-        rm -f python$_MAJOR_VERSION # Remove symlink if already exists to get a newer timestamp
-        ln -s python python$_MAJOR_VERSION
-}
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-loadable-sqlite-extensions"
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/python${_MAJOR_VERSION}m bin/idle*
+lib/python${_MAJOR_VERSION}/idlelib
+lib/python${_MAJOR_VERSION}/test
+lib/python${_MAJOR_VERSION}/tkinter
+lib/python${_MAJOR_VERSION}/turtledemo
+"
 
 termux_step_pre_configure() {
-	# Put the host-built python in path:
-	export TERMUX_ORIG_PATH=$PATH
-	export PATH=$TERMUX_PKG_HOSTBUILD_DIR:$PATH
-
 	# Needed when building with clang, as setup.py only probes
 	# gcc for include paths when finding headers for determining
 	# if extension modules should be built (specifically, the
 	# zlib extension module is not built without this):
 	CPPFLAGS+=" -I$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include"
 	LDFLAGS+=" -L$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib"
-}
-
-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
+	if [ $TERMUX_ARCH = x86_64 ]; then LDFLAGS+=64; fi
 }
 
 termux_step_post_make_install () {
-        (cd $TERMUX_PREFIX/bin && rm -f python && ln -s python3 python)
-        (cd $TERMUX_PREFIX/share/man/man1 && rm -f python.1 && ln -s python3.1 python.1)
-        # Restore path which termux_step_host_build messed with
-        export PATH=$TERMUX_ORIG_PATH
+	(cd $TERMUX_PREFIX/bin && rm -f python && ln -s python3 python)
+	(cd $TERMUX_PREFIX/share/man/man1 && rm -f python.1 && ln -s python3.1 python.1)
 
 	# Save away pyconfig.h so that the python-dev subpackage does not take it.
 	# It is required by ensurepip so bundled with the main python package.
@@ -92,7 +71,8 @@ termux_step_post_massage () {
 
 termux_step_create_debscripts () {
 	## POST INSTALL:
-	echo 'echo "Setting up pip..."' > postinst
+	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
+	echo 'echo "Setting up pip..."' >> postinst
 	# Fix historical mistake which removed bin/pip 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/pip -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
@@ -100,8 +80,9 @@ termux_step_create_debscripts () {
 	echo "$TERMUX_PREFIX/bin/python -m ensurepip --upgrade --default-pip" >> postinst
 
 	## PRE RM:
-	# Avoid running on update:
-	echo 'if [ $1 != "remove" ]; then exit 0; fi' > prerm
+	# Avoid running on update
+	echo "#!$TERMUX_PREFIX/bin/sh" > prerm:
+	echo 'if [ $1 != "remove" ]; then exit 0; fi' >> prerm
 	# Uninstall everything installed through pip:
 	echo "pip freeze 2> /dev/null | xargs pip uninstall -y > /dev/null 2> /dev/null" >> prerm
 	# Cleanup __pycache__ folders: