From d24d85a21fddac4021e5eb9916fdfb39c38d51c1 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 22 Jan 2020 23:03:58 +0100 Subject: [PATCH] sigrok-cross-mingw: Ship Python stdlib *.pyd files. This fixes bug #1409. --- cross-compile/mingw/README | 1 + cross-compile/mingw/sigrok-cross-mingw | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README index 0075fdf..79efbbf 100644 --- a/cross-compile/mingw/README +++ b/cross-compile/mingw/README @@ -22,6 +22,7 @@ Requirements - git - wget - p7zip + - unzip - pkg-config (>= 0.22) - sdcc (needed for building the fx2lafw firmware) - nsis diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 784cd89..bda4d92 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -2,7 +2,7 @@ ## ## This file is part of the sigrok-util project. ## -## Copyright (C) 2013-2018 Uwe Hermann +## Copyright (C) 2013-2020 Uwe Hermann ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -148,6 +148,10 @@ if [ $TARGET = "x86_64" ]; then rm -f python34.dll fi +# We need to include the *.pyd files from python34.zip into the installers, +# otherwise importing certain modules (e.g. ctypes) won't work (bug #1409). +unzip -q $PREFIX/python34.zip *.pyd -d $PREFIX + # Zadig (we ship this with frontends for easy driver switching). $WGET https://github.com/pbatard/libwdi/releases/download/b721/zadig-2.4.exe -O $PREFIX/zadig.exe $WGET https://github.com/pbatard/libwdi/releases/download/v1.2.5/zadig_xp-2.2.exe -O $PREFIX/zadig_xp.exe -- 2.30.2