Date: Wed, 26 Sep 2018 06:36:20 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480717 - in head/math/cln: . files Message-ID: <201809260636.w8Q6aKM3065024@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Wed Sep 26 06:36:20 2018 New Revision: 480717 URL: https://svnweb.freebsd.org/changeset/ports/480717 Log: - Fix build with powerpc64 (Patches that fix ARM architectures break powerpc64. Fix this by applying ARM-related patches only on ARM.) PR: 231553 Submitted by: pkubaj@anongoth.pl Added: head/math/cln/files/extra-patch-src_base_cl__low.h (contents, props changed) head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc (contents, props changed) head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc (contents, props changed) Deleted: head/math/cln/files/patch-src_base_cl__low.h head/math/cln/files/patch-src_base_low_cl__low__div.cc head/math/cln/files/patch-src_base_low_cl__low__mul.cc Modified: head/math/cln/Makefile head/math/cln/distinfo Modified: head/math/cln/Makefile ============================================================================== --- head/math/cln/Makefile Wed Sep 26 06:19:44 2018 (r480716) +++ head/math/cln/Makefile Wed Sep 26 06:36:20 2018 (r480717) @@ -25,6 +25,9 @@ INFO= cln .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 <bsd.port.post.mk> Modified: head/math/cln/distinfo ============================================================================== --- head/math/cln/distinfo Wed Sep 26 06:19:44 2018 (r480716) +++ head/math/cln/distinfo Wed Sep 26 06:36:20 2018 (r480717) @@ -1,2 +1,3 @@ +TIMESTAMP = 1537927281 SHA256 (cln-1.3.4.tar.bz2) = 2d99d7c433fb60db1e28299298a98354339bdc120d31bb9a862cafc5210ab748 SIZE (cln-1.3.4.tar.bz2) = 1281348 Added: head/math/cln/files/extra-patch-src_base_cl__low.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/cln/files/extra-patch-src_base_cl__low.h Wed Sep 26 06:36:20 2018 (r480717) @@ -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) \ Added: head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc Wed Sep 26 06:36:20 2018 (r480717) @@ -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_ Added: head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc Wed Sep 26 06:36:20 2018 (r480717) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809260636.w8Q6aKM3065024>