From: Gerhard Sittig <redacted>
Date: Mon, 17 Jan 2022 18:44:24 +0000 (+0100)
Subject: sigrok-cross-mingw: Temporarily unbreak Windows CI builds in dirty ways.
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=commitdiff_plain;h=c9f28bdd231ae9e86660045b13790ff7f9b053be;ds=sidebyside

sigrok-cross-mingw: Temporarily unbreak Windows CI builds in dirty ways.

A typical use of the cross-compile scripts are CI builds, which currently
fail in the Python tarball download step. Disable certificate checks when
sigrok.org build machines fetch data from the sigrok.org site. Keep the
Zadig download unaffected.

Another typical use is the convenient local compilation from source at
users' sites, which should be rare since nightlies are available, while
developers don't run the cross-compile scripts which are designed for
single shots instead of multiple iterations including local source code
modifications. Which should make this change acceptable for this use
case as well, and happens to unbreak it, too.

Add a TODO comment, ideally this commit soon gets reverted.
---

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index dbbaa3a..2a4b29d 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -107,6 +107,11 @@ mkdir -p $PREFIX
 
 $ECHO "preparing Python dependency ..."
 
+# This is a HACK which temporarily unbreaks Windows CI builds.
+# TODO Remove this line as well as $WGET_SR references below
+# when the Python34 download works again.
+WGET_SR="$WGET --no-check-certificate"
+
 # Cross-compiling Python is highly non-trivial, so we avoid it for now.
 # The download below is a repackaged tarball of the official Python 3.4.4 MSI
 # installer for Windows:
@@ -114,7 +119,7 @@ $ECHO "preparing Python dependency ..."
 #   - https://www.python.org/ftp/python/3.4.4/python-3.4.4.amd64.msi
 # The MSI file has been installed on a Windows box and then c:\Python34\libs
 # and c:\Python34\include have been stored in the Python34_*.tar.gz tarball.
-$WGET http://www.sigrok.org/tmp/Python34_$TARGET.tar.gz -O $PREFIX/Python34.tar.gz
+$WGET_SR http://www.sigrok.org/tmp/Python34_$TARGET.tar.gz -O $PREFIX/Python34.tar.gz
 tar xzf $PREFIX/Python34.tar.gz -C $PREFIX
 
 # Fix for bug #1195.
@@ -143,8 +148,8 @@ EOF
 # The file python34.zip contains all files from the 'DLLs', 'Lib', and 'libs'
 # subdirectories from an installed Python on Windows (c:\python34), i.e. some
 # libraries and all Python stdlib modules.
-$WGET http://www.sigrok.org/tmp/python34_$TARGET.dll -O $PREFIX/python34.dll
-$WGET http://www.sigrok.org/tmp/python34_$TARGET.zip -O $PREFIX/python34.zip
+$WGET_SR http://www.sigrok.org/tmp/python34_$TARGET.dll -O $PREFIX/python34.dll
+$WGET_SR http://www.sigrok.org/tmp/python34_$TARGET.zip -O $PREFIX/python34.zip
 
 # In order to link against Python we need libpython34.a.
 # The upstream Python 32bit installer ships this, the x86_64 installer