[packages/gmp] - updated to 6.2.0 - adjusted multilib patch and its applying to cover arm/aarch64 multilib and ix86

[qboosh]

commit 904148045624e7de696a14c806a86aa4cc7c8823
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jan 23 21:33:36 2020 +0100

    - updated to 6.2.0
    - adjusted multilib patch and its applying to cover arm/aarch64 multilib and ix86/x86_64 multilib in x32 packages

 gmp-multilib.patch |  4 ++--
 gmp.spec           | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/gmp.spec b/gmp.spec
index ff7bef1..5586c1d 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -12,21 +12,21 @@ Summary(pt_BR.UTF-8):	Biblioteca de precisão arbitrária da GNU
 Summary(uk.UTF-8):	Бібліотека GNU довільної точності
 Summary(ru.UTF-8):	Библиотека GNU произвольной точности
 Name:		gmp
-Version:	6.1.2
+Version:	6.2.0
 Release:	1
 License:	LGPL v3+
 Group:		Libraries
-Source0:	http://ftp.gnu.org/gnu/gmp/%{name}-%{version}.tar.lz
-# Source0-md5:	205e230117debf3754944509350627a1
+Source0:	https://ftp.gnu.org/gnu/gmp/%{name}-%{version}.tar.lz
+# Source0-md5:	e3e08ac185842a882204ba3c37985127
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-multilib.patch
 Patch2:		%{name}-cpu.patch
 Patch3:		%{name}-tinfo.patch
-URL:		http://gmplib.org/
+URL:		https://gmplib.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.8
 %{?with_cxx:BuildRequires:	libstdc++-devel}
-BuildRequires:	libtool >= 2:1.4d-3
+BuildRequires:	libtool >= 2:2
 BuildRequires:	lzip
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo
@@ -215,7 +215,7 @@ arytmetycznej GNU.
 %prep
 %setup -q
 %patch0 -p1
-%ifarch %{ix86} %{x8664} ppc ppc64 s390 s390x sparc sparcv9 sparc64
+%ifarch %{ix86} %{x8664} x32 %{arm} aarch64 ppc ppc64 s390 s390x sparc sparcv9 sparc64
 # ugly hack, don't apply on other archs (also recheck sizes on each upgrade)
 %patch1 -p1
 %endif
@@ -270,6 +270,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgmp.so
 %{_libdir}/libgmp.la
 %{_includedir}/gmp.h
+%{_pkgconfigdir}/gmp.pc
 %{_infodir}/gmp.info*
 
 %files static
@@ -287,6 +288,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgmpxx.so
 %{_libdir}/libgmpxx.la
 %{_includedir}/gmpxx.h
+%{_pkgconfigdir}/gmpxx.pc
 
 %files c++-static
 %defattr(644,root,root,755)
diff --git a/gmp-multilib.patch b/gmp-multilib.patch
index ca00165..f33b505 100644
--- a/gmp-multilib.patch
+++ b/gmp-multilib.patch
@@ -5,8 +5,8 @@
  #define __GMP_HAVE_HOST_CPU_FAMILY_power   @HAVE_HOST_CPU_FAMILY_power@
  #define __GMP_HAVE_HOST_CPU_FAMILY_powerpc @HAVE_HOST_CPU_FAMILY_powerpc@
 -#define GMP_LIMB_BITS                      @GMP_LIMB_BITS@
-+/* ugly hack: limb size differs depending on ABI */
-+#if defined(__arch64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__)
++/* ugly hack: limb size differs depending on ABI; note: x32 ABI uses longlong limb, so also 64 bits */
++#if defined(__arch64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__) || defined(_LP64)
 +#define GMP_LIMB_BITS                      64
 +#else
 +#define GMP_LIMB_BITS                      32
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gmp.git/commitdiff/904148045624e7de696a14c806a86aa4cc7c8823