[pkgsrc/pkgsrc-2017Q1]: pkgsrc/devel/gmp Pullup ticket #5482 - requested by s...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/49c9252a1741
branches:  pkgsrc-2017Q1
changeset: 360426:49c9252a1741
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Wed Jun 21 18:26:00 2017 +0000

description:
Pullup ticket #5482 - requested by sevan
devel/gmp: build fix

Revisions pulled up:
- devel/gmp/distinfo                                            1.53-1.54
- devel/gmp/patches/patch-ab                                    deleted
- devel/gmp/patches/patch-acinclude.m4                          1.1

---
   Module Name:    pkgsrc
   Committed By:   msaitoh
   Date:           Thu Jun 15 04:11:50 UTC 2017

   Modified Files:
           pkgsrc/devel/gmp: distinfo
   Added Files:
           pkgsrc/devel/gmp/patches: patch-acinclude.m4
   Removed Files:
           pkgsrc/devel/gmp/patches: patch-ab

   Log Message:
    Fix PR pkg/51788(fails in configure phase). Use calloc() instead of
   malloc().
   This bug was observed with "ln -s J /etc/malloc.conf"

---
   Module Name:    pkgsrc
   Committed By:   msaitoh
   Date:           Thu Jun 15 04:12:32 UTC 2017

   Modified Files:
           pkgsrc/devel/gmp: distinfo

   Log Message:
   Fix distinfo.

diffstat:

 devel/gmp/distinfo                   |   4 ++--
 devel/gmp/patches/patch-ab           |  23 -----------------------
 devel/gmp/patches/patch-acinclude.m4 |  34 ++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 25 deletions(-)

diffs (80 lines):

diff -r bbc1de1aed6c -r 49c9252a1741 devel/gmp/distinfo
--- a/devel/gmp/distinfo        Wed Jun 21 18:24:51 2017 +0000
+++ b/devel/gmp/distinfo        Wed Jun 21 18:26:00 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.52 2016/12/19 08:50:45 wiz Exp $
+$NetBSD: distinfo,v 1.52.4.1 2017/06/21 18:26:00 bsiegert Exp $
 
 SHA1 (gmp-6.1.2.tar.bz2) = 366ded6a44cd108ba6b3f5b9a252eab3f3a95cdf
 RMD160 (gmp-6.1.2.tar.bz2) = 03b905b4d7f243705b72b2d7595ce40df716020a
 SHA512 (gmp-6.1.2.tar.bz2) = 268db88447174617f5746d9a6ba2b105940cc1a5e73155eb23b6eedf55f8e7724eda05d161b2de19aca9e794956d226ba9ed6f23124c7c82f7e1872e32b003cf
 Size (gmp-6.1.2.tar.bz2) = 2386766 bytes
 SHA1 (patch-aa) = dec275cbd5886a70f7cf0def1dedf01e7e4a49e9
-SHA1 (patch-ab) = 829812822a72a4926ea4cf6e8ffafdcd13a0f76c
 SHA1 (patch-ac) = 6f7de0a285bec2c2645479d3090dc0276580f3d8
+SHA1 (patch-acinclude.m4) = c5229e932b5a23b99e904879dd906fbca9f924f8
diff -r bbc1de1aed6c -r 49c9252a1741 devel/gmp/patches/patch-ab
--- a/devel/gmp/patches/patch-ab        Wed Jun 21 18:24:51 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2013/01/31 20:30:26 adam Exp $
-
-Fixed detection of __attribute__((__mode__(XX))) for sunpro.
-
---- acinclude.m4.orig  2007-09-01 12:09:03.000000000 +0200
-+++ acinclude.m4       2007-11-25 09:26:07.000000000 +0100
-@@ -3068,7 +3068,15 @@ dnl  Introduced in gcc 2.2, but perhaps 
- AC_DEFUN([GMP_C_ATTRIBUTE_MODE],
- [AC_CACHE_CHECK([whether gcc __attribute__ ((mode (XX))) works],
-                 gmp_cv_c_attribute_mode,
--[AC_TRY_COMPILE([typedef int SItype __attribute__ ((mode (SI)));], ,
-+[AC_TRY_COMPILE([
-+  typedef int SItype __attribute__ ((mode (SI)));
-+  typedef int QItype __attribute__ ((mode (QI)));
-+], [
-+  switch (1) {
-+  case sizeof(SItype):
-+  case sizeof(QItype): ;
-+  }
-+],
-   gmp_cv_c_attribute_mode=yes, gmp_cv_c_attribute_mode=no)
- ])
- if test $gmp_cv_c_attribute_mode = yes; then
diff -r bbc1de1aed6c -r 49c9252a1741 devel/gmp/patches/patch-acinclude.m4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gmp/patches/patch-acinclude.m4      Wed Jun 21 18:26:00 2017 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-acinclude.m4,v 1.1.2.2 2017/06/21 18:26:00 bsiegert Exp $
+
+Fixed memory allocation.
+
+Fixed detection of __attribute__((__mode__(XX))) for sunpro.
+
+--- acinclude.m4.orig  2016-12-17 00:45:27.000000000 +0900
++++ acinclude.m4       2017-06-14 13:05:04.000000000 +0900
+@@ -741,7 +741,7 @@ main ()
+   long i;
+   for (i = 0; i < 88 + 1; i++)
+     a[i] = ~0L;
+-  r = malloc (10000 * sizeof (unsigned long));
++  r = calloc (10000, sizeof (unsigned long));
+   r2 = r;
+   for (i = 0; i < 528; i += 23)
+     {
+@@ -3228,7 +3228,15 @@ dnl  Introduced in gcc 2.2, but perhaps 
+ AC_DEFUN([GMP_C_ATTRIBUTE_MODE],
+ [AC_CACHE_CHECK([whether gcc __attribute__ ((mode (XX))) works],
+                 gmp_cv_c_attribute_mode,
+-[AC_TRY_COMPILE([typedef int SItype __attribute__ ((mode (SI)));], ,
++[AC_TRY_COMPILE([
++  typedef int SItype __attribute__ ((mode (SI)));
++  typedef int QItype __attribute__ ((mode (QI)));
++], [
++  switch (1) {
++  case sizeof(SItype):
++  case sizeof(QItype): ;
++  }
++],
+   gmp_cv_c_attribute_mode=yes, gmp_cv_c_attribute_mode=no)
+ ])
+ if test $gmp_cv_c_attribute_mode = yes; then