[pkgsrc/pkgsrc-2015Q1]: pkgsrc/math/cln Pullup ticket #4718 - requested by joerg

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/48d21e988b43
branches:  pkgsrc-2015Q1
changeset: 649241:48d21e988b43
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat May 16 19:12:34 2015 +0000

description:
Pullup ticket #4718 - requested by joerg
math/cln: build fix

Revisions pulled up:
- math/cln/Makefile                                             1.25
- math/cln/distinfo                                             1.14
- math/cln/patches/patch-src_base_cl__low.h                     1.1

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Fri May 15 09:17:03 UTC 2015

   Modified Files:
        pkgsrc/math/cln: Makefile distinfo
   Added Files:
        pkgsrc/math/cln/patches: patch-src_base_cl__low.h

   Log Message:
   Disable assembler on ARM, it doesn't work with EABI. Don't put a
   variable with C linkage in a namespace, clang (correctly) complains
   about the shadowing (re)declarations. Bump revision.

diffstat:

 math/cln/Makefile                         |   4 +-
 math/cln/distinfo                         |   3 +-
 math/cln/patches/patch-src_base_cl__low.h |  44 +++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)

diffs (74 lines):

diff -r ab6d7996e6e6 -r 48d21e988b43 math/cln/Makefile
--- a/math/cln/Makefile Fri May 15 12:40:54 2015 +0000
+++ b/math/cln/Makefile Sat May 16 19:12:34 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2013/02/27 16:09:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.24.18.1 2015/05/16 19:12:34 bsiegert Exp $
 
 DISTNAME=      cln-1.3.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math
 MASTER_SITES=  http://www.ginac.de/CLN/ \
                ftp://ftpthep.physik.uni-mainz.de/pub/gnu/
diff -r ab6d7996e6e6 -r 48d21e988b43 math/cln/distinfo
--- a/math/cln/distinfo Fri May 15 12:40:54 2015 +0000
+++ b/math/cln/distinfo Sat May 16 19:12:34 2015 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2015/02/07 20:18:39 jdc Exp $
+$NetBSD: distinfo,v 1.13.2.1 2015/05/16 19:12:34 bsiegert Exp $
 
 SHA1 (cln-1.3.2.tar.bz2) = c30dca80e75f45e2107f233075e6d0339ea884b0
 RMD160 (cln-1.3.2.tar.bz2) = 8644a278e99c3e15ebf83f5e641758bdecad8b23
 Size (cln-1.3.2.tar.bz2) = 1275638 bytes
 SHA1 (patch-include_cln_exception.h) = 2d7ec63ee174793ad69ae3b54599f1c347b20c9f
 SHA1 (patch-include_cln_types.h) = 2e685a55babc03756ff2c170ad23b86c8888f7dc
+SHA1 (patch-src_base_cl__low.h) = 385d1bf88b8b80104da9a9e006a1b87edc3a0e84
diff -r ab6d7996e6e6 -r 48d21e988b43 math/cln/patches/patch-src_base_cl__low.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/cln/patches/patch-src_base_cl__low.h Sat May 16 19:12:34 2015 +0000
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_base_cl__low.h,v 1.1.2.2 2015/05/16 19:12:34 bsiegert Exp $
+
+--- src/base/cl_low.h.orig     2015-04-30 23:51:42.000000000 +0000
++++ src/base/cl_low.h
+@@ -202,13 +202,7 @@ inline uint32 mulu32_unchecked (uint32 a
+ // > arg1, arg2 : zwei 32-Bit-Zahlen
+ // < 2^32*hi+lo : eine 64-Bit-Zahl
+   extern "C" uint32 mulu32_ (uint32 arg1, uint32 arg2); // -> Low-Teil
+-#ifdef _MSC_VER
+-  // Workaround MSVC compiler bug: extern "C" results in wrong symbols, when
+-  // declared inside a namespace!
+ } extern "C" uint32 mulu32_high; namespace cln {        // -> High-Teil
+-#else
+-  extern "C" uint32 mulu32_high;                        // -> High-Teil
+-#endif
+ #if defined(__GNUC__) && defined(__m68k__) && !defined(NO_ASM)
+   #define mulu32(x,y,hi_zuweisung,lo_zuweisung)  \
+     ({ var uint32 _x = (x);       \
+@@ -530,12 +524,7 @@ inline uint32 mulu32_unchecked (uint32 a
+ // < uint16 r: x mod y
+ // < x = q*y+r
+   extern "C" uint32 divu_3216_3216_ (uint32 x, uint16 y); // -> Quotient q
+-#ifdef _MSC_VER
+-  // Workaround MSVC compiler bug.
+ } extern "C" uint16 divu_16_rest; namespace cln {         // -> Rest r
+-#else
+-  extern "C" uint16 divu_16_rest;                         // -> Rest r
+-#endif
+ #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM)
+   #define divu_3216_3216(x,y,q_zuweisung,r_zuweisung)  \
+     ({var uint32 __x = (x);        \
+@@ -585,12 +574,7 @@ inline uint32 mulu32_unchecked (uint32 a
+ // < uint32 r: x mod y
+ // < x = q*y+r
+   extern "C" uint32 divu_3232_3232_ (uint32 x, uint32 y); // -> Quotient q
+-#ifdef _MSC_VER
+-  // Workaround MSVC compiler bug.
+ } extern "C" uint32 divu_32_rest; namespace cln {         // -> Rest r
+-#else
+-  extern "C" uint32 divu_32_rest;                         // -> Rest r
+-#endif
+ #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM)
+   #define divu_3232_3232(x,y,q_zuweisung,r_zuweisung)  \
+     ({var uint32 __x = (x);        \