Python3: update to Python3-3.7.5; install target

Remove bogus post_unpack() step as it no longer has any effect with
repsect to pgen (or pgen2).

packages/lang/Python3/package.mk

@@ -3,19 +3,20 @@
 
 PKG_NAME="Python3"
 # When changing PKG_VERSION remember to sync PKG_PYTHON_VERSION!
-PKG_VERSION="3.7.3"
+PKG_VERSION="3.7.5"
-PKG_SHA256="da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318"
+PKG_SHA256="e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.python.org/"
 PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/${PKG_NAME::-1}-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host xz:host"
-PKG_DEPENDS_TARGET="toolchain sqlite expat zlib bzip2 openssl Python3:host readline ncurses"
+PKG_DEPENDS_TARGET="toolchain Python3:host sqlite expat zlib bzip2 openssl libffi readline ncurses"
 PKG_LONGDESC="Python3 is an interpreted object-oriented programming language."
-
-PKG_PYTHON_VERSION=python3.7
-
 PKG_TOOLCHAIN="autotools"
 
+PKG_PYTHON_VERSION="python3.7"
+
+PKG_PY_DISABLED_MODULES="_tkinter nis gdbm bsddb ossaudiodev"
+
 PKG_CONFIGURE_OPTS_HOST="ac_cv_prog_HAS_HG=/bin/false
                          ac_cv_prog_SVNVERSION=/bin/false
                          --disable-pyc-build
@@ -78,20 +79,21 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_prog_HAS_HG=/bin/false
                            --with-doc-strings
                            --without-pymalloc
                            --without-ensurepip
-                           --with-threads
                            --enable-ipv6
 "
 
-post_unpack() {
+pre_configure_host() {
-  # This is needed to make sure the Python build process doesn't try to
+  export DISABLED_EXTENSIONS="readline _curses _curses_panel $PKG_PY_DISABLED_MODULES"
-  # regenerate those files with the pgen program. Otherwise, it builds
+}
-  # pgen for the target, and tries to run it on the host.
+
-    touch $PKG_BUILD/Include/graminit.h
+post_make_host() {
-    touch $PKG_BUILD/Python/graminit.c
+  # python distutils per default adds -L$LIBDIR when linking binary extensions
+  sed -e "s|^ 'LIBDIR':.*| 'LIBDIR': '/usr/lib',|g" -i $(find $PKG_BUILD/.$HOST_NAME -not -path '*/__pycache__/*' -name '_sysconfigdata__*.py')
 }
 
 post_makeinstall_host() {
-  rm -f $TOOLCHAIN/bin/python*-config
+  ln -sf $PKG_PYTHON_VERSION $TOOLCHAIN/bin/python
+
   rm -f $TOOLCHAIN/bin/smtpd.py*
   rm -f $TOOLCHAIN/bin/pyvenv
   rm -f $TOOLCHAIN/bin/pydoc*
@@ -101,7 +103,13 @@ post_makeinstall_host() {
   cp $PKG_BUILD/Tools/scripts/reindent.py $TOOLCHAIN/lib/$PKG_PYTHON_VERSION
 }
 
+pre_configure_target() {
+  export DISABLED_EXTENSIONS="$PKG_PY_DISABLED_MODULES"
+}
+
 post_makeinstall_target() {
+  ln -sf $PKG_PYTHON_VERSION $INSTALL/usr/bin/python
+
   rm -fr $PKG_BUILD/.$TARGET_NAME/build/temp.*
 
   PKG_INSTALL_PATH_LIB=$INSTALL/usr/lib/$PKG_PYTHON_VERSION
@@ -110,6 +118,8 @@ post_makeinstall_target() {
     rm -rf $PKG_INSTALL_PATH_LIB/$dir
   done
 
+  rm -rf $PKG_INSTALL_PATH_LIB/distutils/command/*.exe
+
   rm -rf $INSTALL/usr/bin/pyvenv
   rm -rf $INSTALL/usr/bin/python*-config
   rm -rf $INSTALL/usr/bin/smtpd.py $INSTALL/usr/bin/smtpd.py.*

packages/lang/Python3/patches/Python3-0000-default-is-optimized.patch

@@ -1,14 +1,18 @@
-From 722c059f586ffd26bb3c447c56cb4d2601d9f94c Mon Sep 17 00:00:00 2001
+From 34116c8ab386aa1fb29f1819ee44b4e89260a1f1 Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Sat, 8 Sep 2018 06:24:14 +0100
+Date: Thu, 17 Oct 2019 00:18:30 +0100
-Subject: [PATCH] Default is optimized
+Subject: [PATCH] Enable optimization by default
+
+Do *not* enable Py_OptimizeFlag=2 (or higher) as this will stop
+__doc__ output from being generated which will prevent the qemu
+package for Generic from building.
 
 ---
  Python/pylifecycle.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
-index fdb759f..432119e 100644
+index 55d1ba5..fe6e082 100644
 --- a/Python/pylifecycle.c
 +++ b/Python/pylifecycle.c
 @@ -115,7 +115,7 @@ int Py_VerboseFlag = 0; /* Needed by import.c */
@@ -16,7 +20,7 @@ index fdb759f..432119e 100644
  int Py_InteractiveFlag = 0; /* Needed by Py_FdIsInteractive() below */
  int Py_InspectFlag = 0; /* Needed to determine whether to exit at SystemExit */
 -int Py_OptimizeFlag = 0; /* Needed by compile.c */
-+int Py_OptimizeFlag = 2; /* Needed by compile.c */
++int Py_OptimizeFlag = 1; /* Needed by compile.c */
  int Py_NoSiteFlag = 0; /* Suppress 'import site' */
  int Py_BytesWarningFlag = 0; /* Warn on str(bytes) and str(buffer) */
  int Py_FrozenFlag = 0; /* Needed by getpath.c */