Update scripts/gcc15.diff (avoid autoreconf)

Author: skirpichev

.github/workflows/os.yml

@@ -25,14 +25,14 @@ jobs:
       - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
-      - run: brew install autoconf automake libtool
-        if: ${{ startsWith(matrix.os, 'macos') }}
       - uses: msys2/[email protected]
         with:
           install: >-
             mingw-w64-ucrt-x86_64-pkg-config
             mingw-w64-ucrt-x86_64-gcc
-            autotools
+            diffutils
+            m4
+            make
             patch
           msystem: ucrt64
           path-type: inherit

.github/workflows/wheels.yml

@@ -18,12 +18,12 @@ jobs:
         with:
           install: >-
             mingw-w64-ucrt-x86_64-gcc
-            autotools
+            diffutils
+            m4
+            make
             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

@@ -13,7 +13,6 @@ cd gmp-${GMP_VERSION}
 patch -N -Z -p1 < ../scripts/fat_build_fix.diff
 patch -N -Z -p0 < ../scripts/dll-importexport.diff
 patch -N -Z -p1 < ../scripts/gcc15.diff
-autoreconf -fi
 
 unset CFLAGS
 

scripts/gcc15.diff

@@ -27,3 +27,25 @@ diff -r e84c5c785bbe -r 8e7bb4ae7a18 acinclude.m4
  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;}
+diff --git a/configure b/configure
+index 7910aa0..fd1f494 100755
+--- a/configure
++++ b/configure
+@@ -6568,7 +6568,7 @@ if test "$gmp_prog_cc_works" = yes; then
+
+ #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;}
+@@ -8187,7 +8187,7 @@ if test "$gmp_prog_cc_works" = yes; then
+
+ #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;}