Merge pull request #251 from skirpichev/update-msys2/244

Update msys2/setup-msys2 action

Author: skirpichev

.github/workflows/os.yml

@@ -18,6 +18,8 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
+      - run: brew install autoconf automake libtool
+        if: ${{ startsWith(matrix.os, 'macos') }}
       - name: Cache GNU GMP builds
         id: cache-gmp
         uses: actions/cache@v4

.github/workflows/wheels.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: msys2/setup-msys2@v2.27.0
+      - uses: msys2/setup-msys2@v2.28.0
         name: Setup msys2
         with:
           install: >-
@@ -21,6 +21,8 @@ jobs:
             patch
           msystem: ucrt64
         if: ${{ startsWith(matrix.os, 'windows') }}
+      - run: brew install autoconf automake libtool
+        if: ${{ startsWith(matrix.os, 'macos') }}
       # Install pkgconfig on Windows from choco rather than from msys and
       # avoid using the Strawberry one.
       - run: choco install -y --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite

scripts/cibw_before_all.sh

@@ -11,10 +11,9 @@ curl -s -O https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.xz
 tar -xf gmp-${GMP_VERSION}.tar.xz
 cd gmp-${GMP_VERSION}
 patch -N -Z -p1 < ../scripts/fat_build_fix.diff
-if [ "$OSTYPE" = "msys" ] || [ "$OSTYPE" = "cygwin" ]
-then
-  patch -N -Z -p0 < ../scripts/dll-importexport.diff
-fi
+patch -N -Z -p0 < ../scripts/dll-importexport.diff
+patch -N -Z -p1 < ../scripts/gcc15.diff
+autoreconf -fi
 
 unset CFLAGS
 

scripts/gcc15.diff

@@ -0,0 +1,29 @@
+changeset:   18477:8e7bb4ae7a18
+user:        Marc Glisse <[email protected]>
+date:        Wed Jan 29 22:38:02 2025 +0100
+summary:     Complete function prototype in acinclude.m4 for C23 compatibility
+
+#diff -r e84c5c785bbe -r 8e7bb4ae7a18 ChangeLog
+#--- a/ChangeLog	Wed Dec 04 18:26:27 2024 +0100
+#+++ b/ChangeLog	Wed Jan 29 22:38:02 2025 +0100
+#@@ -1,3 +1,8 @@
+#+2025-01-29  Rudi Heitbaum <[email protected]>
+#+	    Marc Glisse <[email protected]>
+#+
+#+	* acinclude.m4: Complete function prototype.
+#+
+# 2024-05-15 Sven Anderson <[email protected]>
+#
+# 	* mpn/x86_64/fat/fat.c: Fix bug in BMI2 detection.
+diff -r e84c5c785bbe -r 8e7bb4ae7a18 acinclude.m4
+--- a/acinclude.m4	Wed Dec 04 18:26:27 2024 +0100
++++ b/acinclude.m4	Wed Jan 29 22:38:02 2025 +0100
+@@ -609,7 +609,7 @@
+
+ #if defined (__GNUC__) && ! defined (__cplusplus)
+ typedef unsigned long long t1;typedef t1*t2;
+-void g(){}
++void g(int,t1 const*,t1,t2,t1 const*,int){}
+ void h(){}
+ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
+ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}