From 8cb8e5ede09e816339015424b76f2159b5155ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= <juhani@krekelä.fi>
Date: Wed, 6 Jul 2022 15:35:37 +0300
Subject: [PATCH] Update to gmp-6.2.1.

---
 ports/libgmp/libgmp.patch | 51 +--------------------------------------
 ports/libgmp/libgmp.port  |  7 +++---
 2 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/ports/libgmp/libgmp.patch b/ports/libgmp/libgmp.patch
index 8809465d..69a76486 100644
--- a/ports/libgmp/libgmp.patch
+++ b/ports/libgmp/libgmp.patch
@@ -1,56 +1,7 @@
-diff -Paur --no-dereference -- libgmp.upstream/configfsf.sub libgmp/configfsf.sub
---- libgmp.upstream/configfsf.sub
-+++ libgmp/configfsf.sub
-@@ -1356,7 +1356,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-diff -Paur --no-dereference -- libgmp.upstream/configure libgmp/configure
---- libgmp.upstream/configure
-+++ libgmp/configure
-@@ -6224,6 +6224,8 @@
-    1666 to segfault with e.g., -O2 -mpowerpc64.  */
- 
- #if defined (__GNUC__) && ! defined (__cplusplus)
-+h();
-+g();
- typedef unsigned long long t1;typedef t1*t2;
- 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;}
-@@ -6288,6 +6290,7 @@
-    1666 to get an ICE with -O1 -mpowerpc64.  */
- 
- #if defined (__GNUC__) && ! defined (__cplusplus)
-+g();
- f(int u){int i;long long x;x=u?~0:0;if(x)for(i=0;i<9;i++);x&=g();if(x)g();}
- g(){}
- #else
-@@ -7777,6 +7780,8 @@
-    1666 to segfault with e.g., -O2 -mpowerpc64.  */
- 
- #if defined (__GNUC__) && ! defined (__cplusplus)
-+h();
-+g();
- typedef unsigned long long t1;typedef t1*t2;
- 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;}
-@@ -7841,6 +7846,7 @@
-    1666 to get an ICE with -O1 -mpowerpc64.  */
- 
- #if defined (__GNUC__) && ! defined (__cplusplus)
-+g();
- f(int u){int i;long long x;x=u?~0:0;if(x)for(i=0;i<9;i++);x&=g();if(x)g();}
- g(){}
- #else
 diff -Paur --no-dereference -- libgmp.upstream/gmp-h.in libgmp/gmp-h.in
 --- libgmp.upstream/gmp-h.in
 +++ libgmp/gmp-h.in
-@@ -254,6 +254,7 @@
+@@ -250,6 +250,7 @@
  /* For reference, "defined(EOF)" cannot be used here.  In g++ 2.95.4,
     <iostream> defines EOF but not FILE.  */
  #if defined (FILE)                                              \
diff --git a/ports/libgmp/libgmp.port b/ports/libgmp/libgmp.port
index 824e9bd1..2672d9ba 100644
--- a/ports/libgmp/libgmp.port
+++ b/ports/libgmp/libgmp.port
@@ -1,14 +1,13 @@
 NAME=libgmp
 BUILD_LIBRARIES=libstdc++
-VERSION=6.0.0a
+VERSION=6.2.1
 DISTNAME=gmp-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764
+SHA256SUM=fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/gmp
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE='GPL-2.0-or-later OR LGPL-3.0-or-later'
 BUILD_SYSTEM=configure
 CONFIGURE_ARGS=--enable-cxx
 POST_INSTALL=tix-eradicate-libtool-la
-# TODO: Remove after upgrading past 6.0.0a.
-VERSION_REGEX='([0-9]+\.[0-9]+(\.[0-9]+)*a?)'