From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Thu, 30 Sep 2021 10:56:23 +0000 (+0200)
Subject: Work around new delocation failure on Windows
X-Git-Tag: 3.0~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c3cc44bc359be522575801556d133271f1d88e8;p=thirdparty%2Fpsycopg.git

Work around new delocation failure on Windows

https://github.com/psycopg/psycopg/runs/3754213309?check_suite_focus=true

Not sure this is the right thing to do, if we are pulling in the right
dll.
---

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index df12fdf65..869627af0 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -210,7 +210,7 @@ jobs:
           CIBW_ARCHS_WINDOWS: AMD64 x86
           CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
-            delvewheel repair -w {dest_dir} --no-mangle libiconv-2.dll {wheel}
+            delvewheel repair -w {dest_dir} --no-mangle "libiconv-2.dll;libwinpthread-1.dll" {wheel}
           CIBW_TEST_REQUIRES: ./psycopg[test] ./psycopg_pool
           CIBW_TEST_COMMAND: pytest {project}/tests -m "not slow" --color yes
           CIBW_ENVIRONMENT_WINDOWS: >-
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bee5273b1..cc9a6038b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -179,7 +179,7 @@ jobs:
           $env:Path = "C:\Program Files\PostgreSQL\13\bin\;$env:Path"
           python ./psycopg_c/setup.py bdist_wheel
           pip install delvewheel
-          &"delvewheel" repair --no-mangle libiconv-2.dll @(Get-ChildItem psycopg_c\dist\*.whl)
+          &"delvewheel" repair --no-mangle "libiconv-2.dll;libwinpthread-1.dll" @(Get-ChildItem psycopg_c\dist\*.whl)
 
       # tox will only build the package from sdist, not from wheel, so we can't
       # use it for testing. Just test everything in the global installation.