From bbe295173d400a37454e487a3ff8fc99153c5aa1 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 3 Dec 2016 16:18:51 -0500 Subject: [PATCH] python&python2: Do not disable ipv6 support Fixes #573. --- packages/python/build.sh | 6 ++++-- packages/python2/build.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/python/build.sh b/packages/python/build.sh index 25a8266e4..52943562a 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_HOSTBUILD=true _MAJOR_VERSION=3.5 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 -TERMUX_PKG_BUILD_REVISION=5 +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. @@ -22,11 +22,13 @@ 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" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_HOST_TUPLE --with-system-ffi --without-ensurepip" # Hard links does not work on Android 6: TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_linkat=no" # Posix semaphores are not supported on Android: 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 () { diff --git a/packages/python2/build.sh b/packages/python2/build.sh index ac02cec87..24922ad84 100644 --- a/packages/python2/build.sh +++ b/packages/python2/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_HOSTBUILD=true _MAJOR_VERSION=2.7 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.12 -TERMUX_PKG_BUILD_REVISION=3 +TERMUX_PKG_BUILD_REVISION=4 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. @@ -22,7 +22,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_HOST_TUPLE --with-system-ffi --without-ensurepip" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-unicode=ucs4" # Let 2to3 be in the python3 package: