Merge pull request qgis#54628 from agiudiceandrea/backport-54616-to-q…

…ueued_ltr_backports [Backport queued_ltr_backports] Fix MingW64 build
rouault · Sep 17, 2023 · 9d62602 · 9d62602
2 parents e6295e2 + 626fd40
commit 9d62602
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml
@@ -31,10 +31,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Update system
-        run: dnf5 -y update
+        run: dnf -y update
 
       - name: Install core dependencies
-        run: dnf5 -y install zip
+        run: dnf -y install zip
 
       - name: Install build dependencies
         run: ./ms-windows/mingw/mingwdeps.sh

diff --git a/ms-windows/mingw/build.sh b/ms-windows/mingw/build.sh
@@ -76,10 +76,7 @@ mkdir -p "$BUILDDIR"
 (
   CRSSYNC_BIN=$(readlink -f "$SRCDIR")/build/output/bin/crssync
   cd "$BUILDDIR"
-  rpm --eval "%{mingw64_cmake}" > mingw64-cmake.sh
-  sed -i -e 's/%__cmake/cmake/' mingw64-cmake.sh
-  chmod +x mingw64-cmake.sh
-  ./mingw$bits-cmake.sh \
+  mingw$bits-cmake \
     -DCMAKE_CROSS_COMPILING=1 \
     -DUSE_CCACHE=ON \
     -DCMAKE_BUILD_TYPE=$buildtype \

diff --git a/ms-windows/mingw/mingwdeps.sh b/ms-windows/mingw/mingwdeps.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-dnf5 install -y --nogpgcheck \
+dnf install -y --nogpgcheck \
   mingw64-dlfcn \
   mingw64-exiv2 \
   mingw64-fcgi \