git: 3e31cff62e9e - main - net-p2p/go-prysm: Fix build on aarch64

[Mikael Urankar]

The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3e31cff62e9e6d241f9a93df7fd289352ac8ef16

commit 3e31cff62e9e6d241f9a93df7fd289352ac8ef16
Author:     Mikael Urankar <mikael at FreeBSD.org>
AuthorDate: 2021-09-14 13:53:39 +0000
Commit:     Mikael Urankar <mikael at FreeBSD.org>
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);