From 1e8d88724685efe9c2816ed632d40687ee4a416f Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 17 Mar 2022 20:55:33 +0100 Subject: [PATCH] win build: bump wine 6.0.2->7.0.0.0 to fix installing python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit with wine 6.0.2 and 6.0.3, cpython 3.9.11 fails to install (but cpython 3.9.10 worked) ``` 010c:err:virtual:virtual_setup_exception stack overflow 1220 bytes in thread 010c addr 0x7bc6713d stack 0x440b3c (0x440000-0x441000-0x640000) 🗯 ERROR: wine msiexec failed for dev.msi 🗯 ERROR: prepare-wine failed ``` ----- btw, related note: After changing the Dockerfile, building the docker image from cache failed. Setting ELECBUILD_NOCACHE=1 fixed it: ``` E: Could not configure 'libc6:i386'. E: Could not perform immediate configuration on 'libgcc-s1:i386'. Please see man 5 apt.conf under APT::Immediate-Configure for details. (2) $ ELECBUILD_NOCACHE=1 ./contrib/build-wine/build.sh ``` --- contrib/build-wine/Dockerfile | 8 ++++---- contrib/build-wine/prepare-wine.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/build-wine/Dockerfile b/contrib/build-wine/Dockerfile index be3a9c1e9bb1..0d4201647c01 100644 --- a/contrib/build-wine/Dockerfile +++ b/contrib/build-wine/Dockerfile @@ -45,10 +45,10 @@ RUN wget -nc https://dl.winehq.org/wine-builds/Release.key && \ apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/ && \ apt-get update -q && \ apt-get install -qy \ - wine-stable-amd64:amd64=6.0.2~focal-1 \ - wine-stable-i386:i386=6.0.2~focal-1 \ - wine-stable:amd64=6.0.2~focal-1 \ - winehq-stable:amd64=6.0.2~focal-1 \ + wine-stable-amd64:amd64=7.0.0.0~focal-1 \ + wine-stable-i386:i386=7.0.0.0~focal-1 \ + wine-stable:amd64=7.0.0.0~focal-1 \ + winehq-stable:amd64=7.0.0.0~focal-1 \ && \ rm -rf /var/lib/apt/lists/* && \ apt-get autoremove -y && \ diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index 1acfd7c6a70e..6b7a8dd289c5 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -44,8 +44,8 @@ for msifile in core dev exe lib pip tools; do echo "Installing $msifile..." download_if_not_exist "$PYTHON_DOWNLOADS/${msifile}.msi" "https://www.python.org/ftp/python/$PYTHON_VERSION/$PYARCH/${msifile}.msi" download_if_not_exist "$PYTHON_DOWNLOADS/${msifile}.msi.asc" "https://www.python.org/ftp/python/$PYTHON_VERSION/$PYARCH/${msifile}.msi.asc" - verify_signature "$PYTHON_DOWNLOADS/${msifile}.msi.asc" $KEYRING_PYTHON_DEV - wine msiexec /i "$PYTHON_DOWNLOADS/${msifile}.msi" /qb TARGETDIR=$WINE_PYHOME + verify_signature "$PYTHON_DOWNLOADS/${msifile}.msi.asc" $KEYRING_PYTHON_DEV || fail "invalid sig for ${msifile}.msi" + wine msiexec /i "$PYTHON_DOWNLOADS/${msifile}.msi" /qb TARGETDIR=$WINE_PYHOME || fail "wine msiexec failed for ${msifile}.msi" done break_legacy_easy_install