From nobody Tue Dec 21 16:24:09 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9E28D18F0DA9; Tue, 21 Dec 2021 16:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJMGd2gjCz4R5S; Tue, 21 Dec 2021 16:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3BE24502E; Tue, 21 Dec 2021 16:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BLGO9g5054294; Tue, 21 Dec 2021 16:24:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLGO9Nw054293; Tue, 21 Dec 2021 16:24:09 GMT (envelope-from git) Date: Tue, 21 Dec 2021 16:24:09 GMT Message-Id: <202112211624.1BLGO9Nw054293@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 8288c59996e1 - main - math/cln: unbreak on armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8288c59996e1635170a2866bb3b18b4f6e804cea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640103849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6zVcZQ7ZD7QSAL3/GRMzSX5Va8OP+L5wxMXHw9CoiUk=; b=KtxcS1MIeZnyArtg5CxZi81LgsF1C66ByqlolYmgN2qlBG/kHGuBSvEscAeTIfoUnG+1qz jPp8Q8vlftDAkTRoXwtbFo9t7fei3ZLQsCIJ2TlPb66Thd4AdN6R7U6AzNc0oOl+AelTC7 QJpLAok1SQ3jji/hvmHerJQ7rZafRCeFJwqUvcei0Ga2H6PsvGcmLA4KozaI6B6GWZkckz qGvuzpohxk+5hvN+Df6yXTEiRC3dyKo2dXNfdjub7nL/r2idOEu8K0zlf3rKztPYkfAdY1 N3al4f4TrTgztp2/DeOHtl9n83LRVUPvaaVWXKz3ZbO2MUIm69OrhH+k2AkgYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640103849; a=rsa-sha256; cv=none; b=ZeyoCwCo7H++GEaXpPYUsZQ81JqQnqYbDNhneyR69KUtByNGu3z0Aiqd2bnuK5My7RcphF 7xYc+GNd4vbkHHAn5sLAlALd48uZMU1EIT25uueZal9/9fyv51b2en4fV4fosyN21e3AZL HVY61W3KNBl6oXx395vr2esdM1nkDI1RelrehMw5qB7cUW+bqZUMf2gCZhB8+pDqaT8rH0 Nj6Hb2vKFlCZi33pRyDHjTfY1gArfGn9o+Rgid93HdBFEjgWOG1kqycNTnAUu8gZ1VZAuf WIgmwGeDDbFmeoWkJ5kKdYZNe6v2k6PtyijfSBEePRvv1d/GLfi872lybIIf7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=8288c59996e1635170a2866bb3b18b4f6e804cea commit 8288c59996e1635170a2866bb3b18b4f6e804cea Author: Robert Clausecker AuthorDate: 2021-11-15 10:02:24 +0000 Commit: Mikael Urankar CommitDate: 2021-12-21 16:23:47 +0000 math/cln: unbreak on armv7 This patch fixes the build for math/cln on armv7 by patching some wrong declarations. It also hooks up the test suite to "make test". PR: 259854 Approved by: wen (maintainer timeout) --- math/cln/Makefile | 1 + math/cln/files/patch-src_base_low_cl__low__div.cc | 28 +++++++++++++++++++++++ math/cln/files/patch-src_base_low_cl__low__mul.cc | 14 ++++++++++++ 3 files changed, 43 insertions(+) diff --git a/math/cln/Makefile b/math/cln/Makefile index c6d28c62fd19..d66381a41000 100644 --- a/math/cln/Makefile +++ b/math/cln/Makefile @@ -18,6 +18,7 @@ LIB_DEPENDS= libgmp.so:math/gmp GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gmp=${LOCALBASE} INSTALL_TARGET= install-strip +TEST_TARGET= check USES= compiler:c11 gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes diff --git a/math/cln/files/patch-src_base_low_cl__low__div.cc b/math/cln/files/patch-src_base_low_cl__low__div.cc index 15124551e323..a759e811a95b 100644 --- a/math/cln/files/patch-src_base_low_cl__low__div.cc +++ b/math/cln/files/patch-src_base_low_cl__low__div.cc @@ -1,5 +1,33 @@ --- src/base/low/cl_low_div.cc.orig 2011-04-08 21:07:28 UTC +++ src/base/low/cl_low_div.cc +@@ -10,11 +10,11 @@ + // Implementation. + + #ifdef NEED_VAR_divu_16_rest +-uint16 divu_16_rest; ++extern "C" uint16 divu_16_rest; + #endif + + #ifdef NEED_FUNCTION_divu_3216_1616_ +-uint16 divu_16_rest; ++extern "C" uint16 divu_16_rest = 0; + namespace cln { + #if 1 + // Most processors have a good 32 by 32 bit division, use that. +@@ -101,11 +101,11 @@ uint32 divu_3232_3232_(uint32 x, uint32 y) + #endif + + #ifdef NEED_VAR_divu_32_rest +-uint32 divu_32_rest; ++extern "C" uint32 divu_32_rest; + #endif + + #ifdef NEED_FUNCTION_divu_6432_3232_ +-uint32 divu_32_rest; ++extern "C" uint32 divu_32_rest = 0; + namespace cln { + uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 y) + // Methode: @@ -207,7 +207,7 @@ uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 #endif diff --git a/math/cln/files/patch-src_base_low_cl__low__mul.cc b/math/cln/files/patch-src_base_low_cl__low__mul.cc index 8e8c48c4de2e..4b53103cb060 100644 --- a/math/cln/files/patch-src_base_low_cl__low__mul.cc +++ b/math/cln/files/patch-src_base_low_cl__low__mul.cc @@ -1,5 +1,19 @@ --- src/base/low/cl_low_mul.cc.orig 2011-04-08 21:06:30 UTC +++ src/base/low/cl_low_mul.cc +@@ -10,11 +10,11 @@ + // Implementation. + + #ifdef NEED_VAR_mulu32_high +-uint32 mulu32_high; ++extern "C" uint32 mulu32_high; + #endif + + #ifdef NEED_FUNCTION_mulu32_ +-uint32 mulu32_high; ++extern "C" uint32 mulu32_high = 0; + namespace cln { + uint32 mulu32_ (uint32 x, uint32 y) + { @@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2)