python2: fix hardcoded paths

[termux-packages] / packages / python2 / build.sh

diff --git a/packages/python2/build.sh b/packages/python2/build.sh
index da86caa..142a889 100644 (file)
--- a/packages/python2/build.sh
+++ b/packages/python2/build.sh
@@ -8,9 +8,10 @@ TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libu
 TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=2.7
-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
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.13
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731
 
 # 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]"
@@ -22,7 +23,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_ftime=no"
 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"
+# Do not assume getaddrinfo is buggy when cross compiling:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_buggy_getaddrinfo=no"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_BUILD_TUPLE --with-system-ffi --without-ensurepip"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-unicode=ucs4"
 
 # Let 2to3 be in the python3 package:
@@ -40,13 +43,20 @@ termux_step_host_build () {
 
 termux_step_post_configure () {
        cp $TERMUX_PKG_HOSTBUILD_DIR/Parser/pgen $TERMUX_PKG_BUILDDIR/Parser/pgen
-       $TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen
+       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
+
+       # 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_make_install () {
@@ -55,15 +65,21 @@ termux_step_post_make_install () {
        rm $TERMUX_PREFIX/bin/python
         # Restore path which termux_step_host_build messed with
         export PATH=$TERMUX_ORIG_PATH
+}
 
-       # Used by pip to compile C code, remove the spec file flag
-       # since it's built in for the on-device gcc:
-       perl -p -i -e "s|${_SPECSFLAG}||g" $TERMUX_PREFIX/lib/python${_MAJOR_VERSION}/{config/Makefile,_sysconfigdata.py}
+termux_step_post_massage () {
+       # Verify that desired modules have been included:
+       for module in _ssl bz2 zlib _curses _sqlite3; do
+               if [ ! -f lib/python${_MAJOR_VERSION}/lib-dynload/${module}.so ]; then
+                       termux_error_exit "Python module library $module not built"
+               fi
+       done
 }
 
 termux_step_create_debscripts () {
        ## POST INSTALL:
-       echo "echo 'Setting up pip2...'" > postinst
+       echo "#!$TERMUX_PREFIX/bin/sh" > postinst
+       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
@@ -71,8 +87,9 @@ termux_step_create_debscripts () {
        echo "$TERMUX_PREFIX/bin/python2 -m ensurepip --upgrade --no-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 "pip2 freeze 2> /dev/null | xargs pip2 uninstall -y > /dev/null 2> /dev/null" >> prerm
        # Cleanup __pycache__ folders