[pkgsrc/trunk]: pkgsrc/www/squid3 int64_t GNU atomic operations are used, che...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/587bf173b347
branches:  trunk
changeset: 645061:587bf173b347
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu Jan 22 11:38:58 2015 +0000

description:
int64_t GNU atomic operations are used, check them instead in configure.

i486 is not sufficient, i686 and/or much newer compiler will be required for
NetBSD-5.*-i386.

diffstat:

 www/squid3/Makefile                |   7 +------
 www/squid3/distinfo                |   4 ++--
 www/squid3/patches/patch-configure |  28 +++++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 13 deletions(-)

diffs (82 lines):

diff -r 2e787ab09c28 -r 587bf173b347 www/squid3/Makefile
--- a/www/squid3/Makefile       Thu Jan 22 11:09:18 2015 +0000
+++ b/www/squid3/Makefile       Thu Jan 22 11:38:58 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/01/21 11:23:16 adam Exp $
+# $NetBSD: Makefile,v 1.42 2015/01/22 11:38:58 obache Exp $
 
 DISTNAME=      squid-3.5.1
 CATEGORIES=    www
@@ -52,11 +52,6 @@
 .include "Makefile.common"
 .include "options.mk"
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5]*-i386)
-GNU_ARCH.i386= i486
-CFLAGS+=       -march=i486
-.endif
-
 # Incorrect check for <netinet/ip_icmp.h> on FreeBSD:
 .if $(OPSYS) == "FreeBSD"
 CONFIGURE_ENV+=        ac_cv_header_netinet_ip_icmp_h=yes
diff -r 2e787ab09c28 -r 587bf173b347 www/squid3/distinfo
--- a/www/squid3/distinfo       Thu Jan 22 11:09:18 2015 +0000
+++ b/www/squid3/distinfo       Thu Jan 22 11:38:58 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.29 2015/01/21 11:23:16 adam Exp $
+$NetBSD: distinfo,v 1.30 2015/01/22 11:38:58 obache Exp $
 
 SHA1 (squid-3.5.1.tar.xz) = a2b01afd33d1df3a234e1a5c3405d626f6cf0fb0
 RMD160 (squid-3.5.1.tar.xz) = c0adf12299ce7fcc2a9f45a81f8eabba45788cbb
 Size (squid-3.5.1.tar.xz) = 2281248 bytes
 SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
-SHA1 (patch-configure) = b0137b706bf49b8463e355f69693e85877c22de5
+SHA1 (patch-configure) = 2e9b7570bfc58285c5288075af35a283852c7492
 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
 SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6
 SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
diff -r 2e787ab09c28 -r 587bf173b347 www/squid3/patches/patch-configure
--- a/www/squid3/patches/patch-configure        Thu Jan 22 11:09:18 2015 +0000
+++ b/www/squid3/patches/patch-configure        Thu Jan 22 11:38:58 2015 +0000
@@ -1,10 +1,28 @@
-$NetBSD: patch-configure,v 1.4 2015/01/21 11:23:16 adam Exp $
+$NetBSD: patch-configure,v 1.5 2015/01/22 11:38:58 obache Exp $
 
-Portability fix.
+* int64_t GNU atomic operations are used, check them instead.
+* Portability fix.
 
---- configure.orig     2015-01-21 08:58:55.000000000 +0000
+--- configure.orig     2015-01-13 12:54:26.000000000 +0000
 +++ configure
-@@ -32600,7 +32600,7 @@ done
+@@ -20128,8 +20128,14 @@ $as_echo "cross-compiler cant tell" >&6;
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
+-    int n = 0;
++$ac_includes_default
++#ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++#endif
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
++    int64_t n = 0;
+ 
+ int
+ main ()
+@@ -32600,7 +32606,7 @@ done
  ## Please see the COPYING and CONTRIBUTORS files for details.
  ##
  
@@ -13,7 +31,7 @@
    BUILD_HELPER="kerberos"
  fi
  
-@@ -33141,7 +33141,7 @@ done
+@@ -33141,7 +33147,7 @@ done
  ## Please see the COPYING and CONTRIBUTORS files for details.
  ##