Index: head/math/cln/Makefile =================================================================== --- head/math/cln/Makefile (revision 480716) +++ head/math/cln/Makefile (revision 480717) @@ -1,30 +1,33 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= cln PORTVERSION= 1.3.4 CATEGORIES= math devel MASTER_SITES= http://www.ginac.de/CLN/ \ http://www.mirrors.wiretapped.net/security/cryptography/libraries/math/cln/ \ ftp://ftpthep.physik.uni-mainz.de/pub/gnu/ MAINTAINER= wen@FreeBSD.org COMMENT= Class Library for Numbers LIB_DEPENDS= libgmp.so:math/gmp GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gmp=${LOCALBASE} INSTALL_TARGET= install-strip USES= gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes INFO= cln .include .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 CPPFLAGS+= -DNO_ASM +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_base_cl__low.h \ + ${PATCHDIR}/extra-patch-src_base_low_cl__low__div.cc \ + ${PATCHDIR}/extra-patch-src_base_low_cl__low__mul.cc .endif .include Index: head/math/cln/distinfo =================================================================== --- head/math/cln/distinfo (revision 480716) +++ head/math/cln/distinfo (revision 480717) @@ -1,2 +1,3 @@ +TIMESTAMP = 1537927281 SHA256 (cln-1.3.4.tar.bz2) = 2d99d7c433fb60db1e28299298a98354339bdc120d31bb9a862cafc5210ab748 SIZE (cln-1.3.4.tar.bz2) = 1281348 Index: head/math/cln/files/patch-src_base_low_cl__low__mul.cc =================================================================== --- head/math/cln/files/patch-src_base_low_cl__low__mul.cc (revision 480716) +++ head/math/cln/files/patch-src_base_low_cl__low__mul.cc (nonexistent) @@ -1,16 +0,0 @@ ---- src/base/low/cl_low_mul.cc.orig 2018-06-23 21:15:19 UTC -+++ src/base/low/cl_low_mul.cc -@@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2) - - - #ifdef NEED_VAR_mulu64_high --uint64 mulu64_high; -+extern "C" uint64 mulu64_high; - #endif - - #ifdef NEED_FUNCTION_mulu64_ --uint64 mulu64_high; -+extern "C" uint64 mulu64_high; - namespace cln { - extern "C" uint64 mulu64_ (uint64 x, uint64 y); - uint64 mulu64_ (uint64 x, uint64 y) Property changes on: head/math/cln/files/patch-src_base_low_cl__low__mul.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/cln/files/patch-src_base_cl__low.h =================================================================== --- head/math/cln/files/patch-src_base_cl__low.h (revision 480716) +++ head/math/cln/files/patch-src_base_cl__low.h (nonexistent) @@ -1,29 +0,0 @@ ---- src/base/cl_low.h.orig 2015-01-28 09:25:18 UTC -+++ src/base/cl_low.h -@@ -207,7 +207,7 @@ inline uint32 mulu32_unchecked (uint32 a - // declared inside a namespace! - } extern "C" uint32 mulu32_high; namespace cln { // -> High-Teil - #else -- extern "C" uint32 mulu32_high; // -> High-Teil -+} extern "C" uint32 mulu32_high; namespace cln { // -> High-Teil - #endif - #if defined(__GNUC__) && defined(__m68k__) && !defined(NO_ASM) - #define mulu32(x,y,hi_zuweisung,lo_zuweisung) \ -@@ -439,7 +439,7 @@ inline uint32 mulu32_unchecked (uint32 a - // Workaround MSVC compiler bug. - } extern "C" uint16 divu_16_rest; namespace cln { // -> Rest r - #else -- extern "C" uint16 divu_16_rest; // -> Rest r -+} extern "C" uint16 divu_16_rest; namespace cln { // -> Rest r - #endif - #endif - #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM) -@@ -589,7 +589,7 @@ inline uint32 mulu32_unchecked (uint32 a - // Workaround MSVC compiler bug. - } extern "C" uint32 divu_32_rest; namespace cln { // -> Rest r - #else -- extern "C" uint32 divu_32_rest; // -> Rest r -+} extern "C" uint32 divu_32_rest; namespace cln { // -> Rest r - #endif - #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM) - #define divu_3232_3232(x,y,q_zuweisung,r_zuweisung) \ Property changes on: head/math/cln/files/patch-src_base_cl__low.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/cln/files/patch-src_base_low_cl__low__div.cc =================================================================== --- head/math/cln/files/patch-src_base_low_cl__low__div.cc (revision 480716) +++ head/math/cln/files/patch-src_base_low_cl__low__div.cc (nonexistent) @@ -1,11 +0,0 @@ ---- src/base/low/cl_low_div.cc.orig 2018-06-23 21:13:46 UTC -+++ src/base/low/cl_low_div.cc -@@ -207,7 +207,7 @@ uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 - #endif - - #ifdef NEED_VAR_divu_64_rest --uint64 divu_64_rest; -+extern "C" uint64 divu_64_rest; - #endif - - #ifdef NEED_FUNCTION_divu_6464_6464_ Property changes on: head/math/cln/files/patch-src_base_low_cl__low__div.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/cln/files/extra-patch-src_base_cl__low.h =================================================================== --- head/math/cln/files/extra-patch-src_base_cl__low.h (nonexistent) +++ head/math/cln/files/extra-patch-src_base_cl__low.h (revision 480717) @@ -0,0 +1,29 @@ +--- src/base/cl_low.h.orig 2015-01-28 09:25:18 UTC ++++ src/base/cl_low.h +@@ -207,7 +207,7 @@ inline uint32 mulu32_unchecked (uint32 a + // declared inside a namespace! + } extern "C" uint32 mulu32_high; namespace cln { // -> High-Teil + #else +- extern "C" uint32 mulu32_high; // -> High-Teil ++} extern "C" uint32 mulu32_high; namespace cln { // -> High-Teil + #endif + #if defined(__GNUC__) && defined(__m68k__) && !defined(NO_ASM) + #define mulu32(x,y,hi_zuweisung,lo_zuweisung) \ +@@ -439,7 +439,7 @@ inline uint32 mulu32_unchecked (uint32 a + // Workaround MSVC compiler bug. + } extern "C" uint16 divu_16_rest; namespace cln { // -> Rest r + #else +- extern "C" uint16 divu_16_rest; // -> Rest r ++} extern "C" uint16 divu_16_rest; namespace cln { // -> Rest r + #endif + #endif + #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM) +@@ -589,7 +589,7 @@ inline uint32 mulu32_unchecked (uint32 a + // Workaround MSVC compiler bug. + } extern "C" uint32 divu_32_rest; namespace cln { // -> Rest r + #else +- extern "C" uint32 divu_32_rest; // -> Rest r ++} extern "C" uint32 divu_32_rest; namespace cln { // -> Rest r + #endif + #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM) + #define divu_3232_3232(x,y,q_zuweisung,r_zuweisung) \ Property changes on: head/math/cln/files/extra-patch-src_base_cl__low.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc =================================================================== --- head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc (nonexistent) +++ head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc (revision 480717) @@ -0,0 +1,11 @@ +--- src/base/low/cl_low_div.cc.orig 2018-06-23 21:13:46 UTC ++++ src/base/low/cl_low_div.cc +@@ -207,7 +207,7 @@ uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 + #endif + + #ifdef NEED_VAR_divu_64_rest +-uint64 divu_64_rest; ++extern "C" uint64 divu_64_rest; + #endif + + #ifdef NEED_FUNCTION_divu_6464_6464_ Property changes on: head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc =================================================================== --- head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc (nonexistent) +++ head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc (revision 480717) @@ -0,0 +1,16 @@ +--- src/base/low/cl_low_mul.cc.orig 2018-06-23 21:15:19 UTC ++++ src/base/low/cl_low_mul.cc +@@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2) + + + #ifdef NEED_VAR_mulu64_high +-uint64 mulu64_high; ++extern "C" uint64 mulu64_high; + #endif + + #ifdef NEED_FUNCTION_mulu64_ +-uint64 mulu64_high; ++extern "C" uint64 mulu64_high; + namespace cln { + extern "C" uint64 mulu64_ (uint64 x, uint64 y); + uint64 mulu64_ (uint64 x, uint64 y) Property changes on: head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property