From owner-dev-commits-ports-main@freebsd.org Tue Sep 14 17:56:16 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C79FB66D932; Tue, 14 Sep 2021 17:56:16 +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 4H89y83G8Xz3lgR; Tue, 14 Sep 2021 17:56:16 +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 8CBB31EFC8; Tue, 14 Sep 2021 17:56:15 +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 18EHuFuU016384; Tue, 14 Sep 2021 17:56:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18EHuF5d016383; Tue, 14 Sep 2021 17:56:15 GMT (envelope-from git) Date: Tue, 14 Sep 2021 17:56:15 GMT Message-Id: <202109141756.18EHuF5d016383@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: 3e31cff62e9e - main - net-p2p/go-prysm: Fix build on aarch64 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: 3e31cff62e9e6d241f9a93df7fd289352ac8ef16 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2021 17:56:16 -0000 The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e31cff62e9e6d241f9a93df7fd289352ac8ef16 commit 3e31cff62e9e6d241f9a93df7fd289352ac8ef16 Author: Mikael Urankar AuthorDate: 2021-09-14 13:53:39 +0000 Commit: Mikael Urankar CommitDate: 2021-09-14 17:56:05 +0000 net-p2p/go-prysm: Fix build on aarch64 Approved by: portmgr (build fix blanket) --- net-p2p/go-prysm/Makefile | 2 +- net-p2p/go-prysm/distinfo | 2 -- ...atch-vendor_github.com_herumi_bls-eth-go-binary_Makefile | 13 +++++++++++++ ...ch-vendor_github.com_herumi_bls-eth-go-binary_bls_bls.go | 3 ++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net-p2p/go-prysm/Makefile b/net-p2p/go-prysm/Makefile index 42e3a499521b..ce7eeb529c8c 100644 --- a/net-p2p/go-prysm/Makefile +++ b/net-p2p/go-prysm/Makefile @@ -11,7 +11,7 @@ COMMENT= Go implementation of the Ethereum 2.0 LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md -ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS= aarch64 amd64 BUILD_DEPENDS= nasm>0:devel/nasm diff --git a/net-p2p/go-prysm/distinfo b/net-p2p/go-prysm/distinfo index 532452f0d15e..7f9e06e038a3 100644 --- a/net-p2p/go-prysm/distinfo +++ b/net-p2p/go-prysm/distinfo @@ -45,8 +45,6 @@ SHA256 (cpuguy83-go-md2man-f79a8a8ca69d_GH0.tar.gz) = c117a3e3741ea39016b678b24d SIZE (cpuguy83-go-md2man-f79a8a8ca69d_GH0.tar.gz) = 52020 SHA256 (d4l3k-messagediff-v1.2.1_GH0.tar.gz) = 00e0d9baf442b0fdd11164d736ea64012d386353db2bd050f13c01c4db4a7813 SIZE (d4l3k-messagediff-v1.2.1_GH0.tar.gz) = 8059 -SHA256 (d4l3k-messagediff-v1.2.1_GH0.tar.gz) = 00e0d9baf442b0fdd11164d736ea64012d386353db2bd050f13c01c4db4a7813 -SIZE (d4l3k-messagediff-v1.2.1_GH0.tar.gz) = 8059 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 SHA256 (davidlazar-go-crypto-b73af7476f6c_GH0.tar.gz) = fe4e1d118f35fd10c21a5aa06ac9e47b1ecbc987e97f7f85574b4aced231cf1f diff --git a/net-p2p/go-prysm/files/patch-vendor_github.com_herumi_bls-eth-go-binary_Makefile b/net-p2p/go-prysm/files/patch-vendor_github.com_herumi_bls-eth-go-binary_Makefile new file mode 100644 index 000000000000..0cd62a5a7614 --- /dev/null +++ b/net-p2p/go-prysm/files/patch-vendor_github.com_herumi_bls-eth-go-binary_Makefile @@ -0,0 +1,13 @@ +--- vendor/github.com/herumi/bls-eth-go-binary/Makefile.orig 2021-07-21 15:06:06.914104000 +0200 ++++ vendor/github.com/herumi/bls-eth-go-binary/Makefile 2021-07-21 15:07:24.522733000 +0200 +@@ -35,6 +35,10 @@ endif + + ifeq ($(CPU),aarch64) + _ARCH=arm64 ++ifeq ($(OS),freebsd) ++ _OS=freebsd ++ MIN_CFLAGS+=-fPIC ++endif + ifeq ($(OS),Linux) + _OS=linux + MIN_CFLAGS+=-fPIC diff --git a/net-p2p/go-prysm/files/patch-vendor_github.com_herumi_bls-eth-go-binary_bls_bls.go b/net-p2p/go-prysm/files/patch-vendor_github.com_herumi_bls-eth-go-binary_bls_bls.go index 2ebb56d3ab27..1e3d5f6bf0dd 100644 --- a/net-p2p/go-prysm/files/patch-vendor_github.com_herumi_bls-eth-go-binary_bls_bls.go +++ b/net-p2p/go-prysm/files/patch-vendor_github.com_herumi_bls-eth-go-binary_bls_bls.go @@ -1,10 +1,11 @@ --- vendor/github.com/herumi/bls-eth-go-binary/bls/bls.go.orig 2021-03-17 23:11:47 UTC +++ vendor/github.com/herumi/bls-eth-go-binary/bls/bls.go -@@ -15,7 +15,7 @@ package bls +@@ -15,7 +15,8 @@ package bls #cgo darwin,arm64 LDFLAGS:-L${SRCDIR}/lib/darwin/arm64 #cgo windows,amd64 LDFLAGS:-L${SRCDIR}/lib/windows/amd64 #cgo openbsd,amd64 LDFLAGS:-L${SRCDIR}/lib/openbsd/amd64 -#cgo freebsd,amd64 LDFLAGS:-L${SRCDIR}/lib/linux/amd64 ++#cgo freebsd,arm64 LDFLAGS:-L${SRCDIR}/lib/freebsd/arm64 +#cgo freebsd,amd64 LDFLAGS:-L${SRCDIR}/lib/freebsd/amd64 typedef unsigned int (*ReadRandFunc)(void *, void *, unsigned int); int wrapReadRandCgo(void *self, void *buf, unsigned int n);