From 50641b6130b3c93c7879c16d1a6b65ccfbbd4d95 Mon Sep 17 00:00:00 2001 From: Sergey B Kirpichev Date: Thu, 17 Oct 2024 11:08:13 +0300 Subject: [PATCH] Remove scripts/mp_bitcnt_t.diff --- scripts/cibw_before_all.sh | 1 - scripts/mp_bitcnt_t.diff | 25 ------------------------- 2 files changed, 26 deletions(-) delete mode 100644 scripts/mp_bitcnt_t.diff diff --git a/scripts/cibw_before_all.sh b/scripts/cibw_before_all.sh index aa1265fe..7476fe21 100644 --- a/scripts/cibw_before_all.sh +++ b/scripts/cibw_before_all.sh @@ -13,7 +13,6 @@ 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 the mp_bitcnt_t to "unsigned long long int" on WINDOWS AMD64: -patch -N -Z -p0 < ../scripts/mp_bitcnt_t.diff patch -N -Z -p0 < ../scripts/fat_build_fix.diff # config.guess uses microarchitecture and configfsf.guess doesn't # We replace config.guess with configfsf.guess to avoid microarchitecture diff --git a/scripts/mp_bitcnt_t.diff b/scripts/mp_bitcnt_t.diff deleted file mode 100644 index a7a4e4e9..00000000 --- a/scripts/mp_bitcnt_t.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- gmp-h.in.orig 2024-03-24 10:55:03.711573465 +0300 -+++ gmp-h.in 2024-03-24 10:58:02.762349548 +0300 -@@ -143,7 +143,11 @@ - typedef long int mp_limb_signed_t; - #endif - #endif -+#if defined(_WIN64) -+typedef unsigned long long int mp_bitcnt_t; -+#else - typedef unsigned long int mp_bitcnt_t; -+#endif - - /* For reference, note that the name __mpz_struct gets into C++ mangled - function names, which means although the "__" suggests an internal, we ---- mpz/millerrabin.c.orig 2024-03-24 10:59:05.420511561 +0300 -+++ mpz/millerrabin.c 2024-03-24 10:59:11.428335102 +0300 -@@ -59,7 +59,7 @@ - - static int millerrabin (mpz_srcptr, - mpz_ptr, mpz_ptr, -- mpz_srcptr, unsigned long int); -+ mpz_srcptr, mp_bitcnt_t); - - int - mpz_millerrabin (mpz_srcptr n, int reps)