diff options
| author | joerg <joerg@pkgsrc.org> | 2015-05-15 09:17:03 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-05-15 09:17:03 +0000 |
| commit | 46a4e9555ab9ce696ec2b5edef3c1d974c465e31 (patch) | |
| tree | f4743b4c781692fd1f4f4edcde9bc9c5ba96261e /math | |
| parent | edc4e66b97fd3071869327a7bc06cd974616e15c (diff) | |
| download | pkgsrc-46a4e9555ab9ce696ec2b5edef3c1d974c465e31.tar.gz | |
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 (limited to 'math')
| -rw-r--r-- | math/cln/Makefile | 4 | ||||
| -rw-r--r-- | math/cln/distinfo | 3 | ||||
| -rw-r--r-- | math/cln/patches/patch-src_base_cl__low.h | 44 |
3 files changed, 48 insertions, 3 deletions
diff --git a/math/cln/Makefile b/math/cln/Makefile index 2e63fac4f4f..92cb6c88752 100644 --- a/math/cln/Makefile +++ b/math/cln/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2013/02/27 16:09:27 jperkin Exp $ +# $NetBSD: Makefile,v 1.25 2015/05/15 09:17:03 joerg 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 --git a/math/cln/distinfo b/math/cln/distinfo index 94a7a09e9b9..21d2cfe7217 100644 --- a/math/cln/distinfo +++ b/math/cln/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.13 2015/02/07 20:18:39 jdc Exp $ +$NetBSD: distinfo,v 1.14 2015/05/15 09:17:03 joerg 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 --git a/math/cln/patches/patch-src_base_cl__low.h b/math/cln/patches/patch-src_base_cl__low.h new file mode 100644 index 00000000000..57d2e03fef0 --- /dev/null +++ b/math/cln/patches/patch-src_base_cl__low.h @@ -0,0 +1,44 @@ +$NetBSD: patch-src_base_cl__low.h,v 1.1 2015/05/15 09:17:03 joerg 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); \ |