Mon Nov 16 13:12:41 2020 UTC ()
gmp: update to 6.2.1.

Fix some pkglint while here.

Changes between GMP version 6.2.0 and 6.2.1

  BUGS FIXED
  * A possible overflow of type int is avoided for mpz_cmp on huge operands.

  * Overflows are more carefully detected and reported for mpz_pow_ui.

  * A bug in longlong.h for aarch64 sub_ddmmss, not affecting GMP, was healed.

  * mini-gmp: mpz_out_str and mpq_out_str now correctly handle out of
    range bases.

  FEATURES
  * C90 compliance.

  * Initial support for Darwin on arm64, and improved portability.

  * Support for more processors.

  SPEEDUPS
  * None, except indirectly through recognition of new CPUs.


(wiz)
diff -r1.87 -r1.88 pkgsrc/devel/gmp/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/gmp/builtin.mk
diff -r1.55 -r1.56 pkgsrc/devel/gmp/distinfo
diff -r1.7 -r1.8 pkgsrc/devel/gmp/inplace.mk
cvs diff -r1.87 -r1.88 pkgsrc/devel/gmp/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gmp/Makefile 2020/01/20 21:25:24 1.87
+++ pkgsrc/devel/gmp/Makefile 2020/11/16 13:12:41 1.88
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.87 2020/01/20 21:25:24 adam Exp $ 1# $NetBSD: Makefile,v 1.88 2020/11/16 13:12:41 wiz Exp $
2 2
3DISTNAME= gmp-6.2.0 3DISTNAME= gmp-6.2.1
4CATEGORIES= devel math 4CATEGORIES= devel math
5MASTER_SITES= https://gmplib.org/download/gmp/ 5MASTER_SITES= https://gmplib.org/download/gmp/
6MASTER_SITES+= ${MASTER_SITE_GNU:=gmp/} 6MASTER_SITES+= ${MASTER_SITE_GNU:=gmp/}
7# Use .tar.bz2 distfile so that no extra dependency on archivers/xz 7# Use .tar.bz2 distfile so that no extra dependency on archivers/xz
8# is needed when building lang/gcc* with option gcc-inplace-math. 8# is needed when building lang/gcc* with option gcc-inplace-math.
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://gmplib.org/ 12HOMEPAGE= https://gmplib.org/
13COMMENT= Library for arbitrary precision arithmetic 13COMMENT= Library for arbitrary precision arithmetic
14LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 14LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2
15 15
16USE_LANGUAGES= c c++ c99 16USE_LANGUAGES= c c++ c99
@@ -26,27 +26,27 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/a$//} @@ -26,27 +26,27 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/a$//}
26PLIST_VARS+= cxx 26PLIST_VARS+= cxx
27 27
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29 29
30.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 30.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
31CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} 31CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
32.endif 32.endif
33 33
34.if empty(PKGSRC_COMPILER:Msunpro) 34.if empty(PKGSRC_COMPILER:Msunpro)
35CONFIGURE_ARGS+= --enable-cxx 35CONFIGURE_ARGS+= --enable-cxx
36PLIST.cxx= yes 36PLIST.cxx= yes
37.endif 37.endif
38 38
39.if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI) 39.if !empty(MACHINE_PLATFORM:MIRIX-5.*) && !empty(ABI)
40ABI= o32 40ABI= o32
41.endif 41.endif
42 42
43.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 43.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
44. if !empty(PKGSRC_COMPILER:Msunpro) 44. if !empty(PKGSRC_COMPILER:Msunpro)
45# don't use x86 assembly (it doesn't build) 45# don't use x86 assembly (it doesn't build)
46CONFIGURE_ENV+= MPN_PATH="generic" 46CONFIGURE_ENV+= MPN_PATH="generic"
47. else 47. else
48PKG_OPTIONS_VAR= PKG_OPTIONS.gmp 48PKG_OPTIONS_VAR= PKG_OPTIONS.gmp
49PKG_SUPPORTED_OPTIONS= gmp-fat mmx simd 49PKG_SUPPORTED_OPTIONS= gmp-fat mmx simd
50PKG_SUGGESTED_OPTIONS= gmp-fat 50PKG_SUGGESTED_OPTIONS= gmp-fat
51. include "../../mk/bsd.options.mk" 51. include "../../mk/bsd.options.mk"
52### 52###
cvs diff -r1.10 -r1.11 pkgsrc/devel/gmp/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/gmp/builtin.mk 2020/09/03 08:58:42 1.10
+++ pkgsrc/devel/gmp/builtin.mk 2020/11/16 13:12:41 1.11
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: builtin.mk,v 1.10 2020/09/03 08:58:42 prlw1 Exp $ 1# $NetBSD: builtin.mk,v 1.11 2020/11/16 13:12:41 wiz Exp $
2 2
3BUILTIN_PKG:= gmp 3BUILTIN_PKG:= gmp
4 4
5BUILTIN_FIND_HEADERS_VAR:= H_GMP 5BUILTIN_FIND_HEADERS_VAR:= H_GMP
6BUILTIN_FIND_HEADERS.H_GMP= gmp.h gmp/gmp.h 6BUILTIN_FIND_HEADERS.H_GMP= gmp.h gmp/gmp.h
7 7
8BUILTIN_VERSION_SCRIPT.gmp= ${AWK} \ 8BUILTIN_VERSION_SCRIPT.gmp= ${AWK} \
9 '/\#define[ \t]*__GNU_MP_VERSION[ \t]/ { major = $$3; } \ 9 '/\#define[ \t]*__GNU_MP_VERSION[ \t]/ { major = $$3; } \
10 /\#define[ \t]*__GNU_MP_VERSION_MINOR[ \t]/ { minor = $$3; } \ 10 /\#define[ \t]*__GNU_MP_VERSION_MINOR[ \t]/ { minor = $$3; } \
11 /\#define[ \t]*__GNU_MP_VERSION_PATCHLEVEL[ \t]/ { patch = $$3; } \ 11 /\#define[ \t]*__GNU_MP_VERSION_PATCHLEVEL[ \t]/ { patch = $$3; } \
12 END { if (major!="" && minor!="" && patch!="") \ 12 END { if (major!="" && minor!="" && patch!="") \
13 print major "." minor "." patch; else print ""; }' 13 print major "." minor "." patch; else print ""; }'
14 14
15.include "../../mk/buildlink3/bsd.builtin.mk" 15.include "../../mk/buildlink3/bsd.builtin.mk"
16 16
17### 17###
18### Determine if there is a built-in implementation of the package and 18### Determine if there is a built-in implementation of the package and
19### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 19### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
20### 20###
21.if !defined(IS_BUILTIN.gmp) 21.if !defined(IS_BUILTIN.gmp)
22IS_BUILTIN.gmp= no 22IS_BUILTIN.gmp= no
23. if empty(H_GMP:M__nonexistent__) && empty(H_GMP:M${LOCALBASE}/*) 23. if empty(H_GMP:M__nonexistent__) && empty(H_GMP:M${LOCALBASE}/*)
24IS_BUILTIN.gmp= yes 24IS_BUILTIN.gmp= yes
25. endif 25. endif
26.endif 26.endif
cvs diff -r1.55 -r1.56 pkgsrc/devel/gmp/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gmp/distinfo 2020/01/20 21:25:24 1.55
+++ pkgsrc/devel/gmp/distinfo 2020/11/16 13:12:41 1.56
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.55 2020/01/20 21:25:24 adam Exp $ 1$NetBSD: distinfo,v 1.56 2020/11/16 13:12:41 wiz Exp $
2 2
3SHA1 (gmp-6.2.0.tar.bz2) = 5e9341d3807bc7505376f9ed9f5c1c6c57050aa6 3SHA1 (gmp-6.2.1.tar.bz2) = 2dcf34d4a432dbe6cce1475a835d20fe44f75822
4RMD160 (gmp-6.2.0.tar.bz2) = 9e0c387608c7dd3eb339afcd989ef5037d7cacbd 4RMD160 (gmp-6.2.1.tar.bz2) = 2a4204453eb608bec6bb647ff5a0c47ca4d43878
5SHA512 (gmp-6.2.0.tar.bz2) = ff22ed47fff176ed56301ecab0213316150a3abb370fed031635804f829c878296d7c65597b1f687f394479eef04fae6eba771162f7d363dc4c94c7334fc1fc0 5SHA512 (gmp-6.2.1.tar.bz2) = 8904334a3bcc5c896ececabc75cda9dec642e401fb5397c4992c4fabea5e962c9ce8bd44e8e4233c34e55c8010cc28db0545f5f750cbdbb5f00af538dc763be9
6Size (gmp-6.2.0.tar.bz2) = 2453458 bytes 6Size (gmp-6.2.1.tar.bz2) = 2493916 bytes
7SHA1 (patch-acinclude.m4) = 3f76c0aa8d29ec815a93448f9c4bc976ebdf7a2a 7SHA1 (patch-acinclude.m4) = 3f76c0aa8d29ec815a93448f9c4bc976ebdf7a2a
cvs diff -r1.7 -r1.8 pkgsrc/devel/gmp/inplace.mk (expand / switch to unified diff)

--- pkgsrc/devel/gmp/inplace.mk 2017/10/18 11:15:39 1.7
+++ pkgsrc/devel/gmp/inplace.mk 2020/11/16 13:12:41 1.8
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: inplace.mk,v 1.7 2017/10/18 11:15:39 joerg Exp $ 1# $NetBSD: inplace.mk,v 1.8 2020/11/16 13:12:41 wiz Exp $
2# 2#
3# Include this file to extract devel/gmp source into the WRKSRC of 3# Include this file to extract devel/gmp source into the WRKSRC of
4# another package. This is to be used by GCC packages to avoid the 4# another package. This is to be used by GCC packages to avoid the
5# numerous dependencies devel/gmp has. 5# numerous dependencies devel/gmp has.
6 6
7post-fetch: fetch-inplace-gmp 7post-fetch: fetch-inplace-gmp
8 8
9post-extract: extract-inplace-gmp 9post-extract: extract-inplace-gmp
10 10
 11.PHONY: fetch-inplace-gmp
11fetch-inplace-gmp: 12fetch-inplace-gmp:
12 (cd ../../devel/gmp && ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp EXTRACT_DIR=${WRKSRC} \ 13 (cd ../../devel/gmp && ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp EXTRACT_DIR=${WRKSRC} \
13 WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' SKIP_DEPENDS=YES checksum) 14 WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' SKIP_DEPENDS=YES checksum)
14 15
 16.PHONY: extract-inplace-gmp
15extract-inplace-gmp: 17extract-inplace-gmp:
16 (cd ../../devel/gmp && ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp EXTRACT_DIR=${WRKSRC} \ 18 (cd ../../devel/gmp && ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp EXTRACT_DIR=${WRKSRC} \
17 WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' SKIP_DEPENDS=YES patch) 19 WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' SKIP_DEPENDS=YES patch)
18 ${MV} ${WRKSRC}/gmp-* ${WRKSRC}/gmp 20 ${MV} ${WRKSRC}/gmp-* ${WRKSRC}/gmp
19 21
20USE_TOOLS+= bzcat tar 22USE_TOOLS+= bzcat tar