prebuild-python: get complete python modules package

The prebuild package used by QtCreator did not contain all the necessary
python modules needed by gdb. Get complete package from python.org.
Also make sure those are located by both python.exe and gdb.
We still need the original package to provide all the development files
not included in the embeddable zip file.

Task-number: QTBUG-64855
Change-Id: I109eea70390560e76a668996dfff5bf03424765b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

4 files changed, 14 insertions, 7 deletions

diff --git a/recipes/gdb/gdb-cross-canadian_7.%.bbappend b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
index a47bca7..4e55e66 100644
--- a/recipes/gdb/gdb-cross-canadian_7.%.bbappend
+++ b/recipes/gdb/gdb-cross-canadian_7.%.bbappend
@@ -52,4 +52,5 @@ EOF
 
 do_install_append_sdkmingw32() {
     ln -s ../python35.dll ${D}${bindir}/
+    ln -s ../python35.zip ${D}${bindir}/
 }
diff --git a/recipes/python/nativesdk-prebuild-python.inc b/recipes/python/nativesdk-prebuild-python.inc
index 71e8e72..3d8c083 100644
--- a/recipes/python/nativesdk-prebuild-python.inc
+++ b/recipes/python/nativesdk-prebuild-python.inc
@@ -33,8 +33,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4b8a9367e6bb2acb6f26dc08654f6ee5"
 
 do_unpack[depends] += "p7zip-native:do_populate_sysroot"
 
-DEPENDS = "unzip-native"
-
 inherit bin_package nativesdk python3-dir
 
 PV = "3.5.2"
@@ -51,7 +49,5 @@ do_install() {
     install -d ${D}${bindir}
     install -m 0644 ${S}/python.exe ${D}${bindir}
     install -m 0644 ${S}/python35.dll ${D}${bindir}
-
-    install -d ${D}${libdir}/${PYTHON_DIR}
-    unzip ${S}/python35.zip -d ${D}${libdir}/${PYTHON_DIR}
+    install -m 0644 ${S}/python35.zip ${D}${bindir}
 }
diff --git a/recipes/python/nativesdk-prebuild-python_i686.bb b/recipes/python/nativesdk-prebuild-python_i686.bb
index cf7204a..2ff4f76 100644
--- a/recipes/python/nativesdk-prebuild-python_i686.bb
+++ b/recipes/python/nativesdk-prebuild-python_i686.bb
@@ -31,7 +31,12 @@ require nativesdk-prebuild-python.inc
 
 COMPATIBLE_HOST = "i686.*-mingw.*"
 
-SRC_URI = "http://download.qt.io/development_releases/prebuilt/python/Python35-win-x86.7z"
+SRC_URI = "\
+    https://download.qt.io/development_releases/prebuilt/python/Python35-win-x86.7z \
+    https://www.python.org/ftp/python/${PV}/python-${PV}-embed-win32.zip;name=bin \
+    "
 
 SRC_URI[md5sum] = "3da266445a4e6a93ff1949810141da8f"
 SRC_URI[sha256sum] = "b60c49227c6e920904d784681c16ee3591a18824c3abb89613813f93fde1c1f2"
+SRC_URI[bin.md5sum] = "ad637a1db7cf91e344318d55c94ad3ca"
+SRC_URI[bin.sha256sum] = "75f05800fbe4a8cd6672b268ca53244838684561e03c60c668a7dccb050eb954"
diff --git a/recipes/python/nativesdk-prebuild-python_x86_64.bb b/recipes/python/nativesdk-prebuild-python_x86_64.bb
index f0cc4ca..8e69fbd 100644
--- a/recipes/python/nativesdk-prebuild-python_x86_64.bb
+++ b/recipes/python/nativesdk-prebuild-python_x86_64.bb
@@ -31,7 +31,12 @@ require nativesdk-prebuild-python.inc
 
 COMPATIBLE_HOST = "x86_64.*-mingw.*"
 
-SRC_URI = "http://download.qt.io/development_releases/prebuilt/python/Python35-win-x64.7z"
+SRC_URI = "\
+    https://download.qt.io/development_releases/prebuilt/python/Python35-win-x64.7z \
+    https://www.python.org/ftp/python/${PV}/python-${PV}-embed-amd64.zip;name=bin \
+    "
 
 SRC_URI[md5sum] = "08766b13bcbdcf8217a98bfc291d549f"
 SRC_URI[sha256sum] = "43e38c8a05dcbc2effd1915dbe2dc2be6e701ebf3eb00d6e45197ee773978124"
+SRC_URI[bin.md5sum] = "f1c24bb78bd6dd792a73d5ebfbd3b20e"
+SRC_URI[bin.sha256sum] = "faefbd98f61c0d87c5683eeb526ae4d4a9ddc369bef27870cfe1c8939329d066"