Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Mar 2023 21:31:21 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 35d3583b03b7 - main - devel/etcd32: fix build on riscv64
Message-ID:  <202303032131.323LVLDU022810@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=35d3583b03b7046265d46ef9eec885ec290e04d2

commit 35d3583b03b7046265d46ef9eec885ec290e04d2
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-03-01 18:33:30 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-03 21:31:08 +0000

    devel/etcd32: fix build on riscv64
    
    Bump golang.org/x/sys and github.com/coreos/bbolt to versions that
    support riscv64-freebsd.
    
    Sponsored by:   Berliner Linux User Group e.V.
    Approved by:    olgeni (maintainer)
    Approved by:    eduardo (mentor)
    Differential Revision: https://reviews.freebsd.org/D38864
---
 devel/etcd32/Makefile | 10 +++++++++-
 devel/etcd32/distinfo |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/devel/etcd32/Makefile b/devel/etcd32/Makefile
index c64102e5d4a5..381bfb21ee9c 100644
--- a/devel/etcd32/Makefile
+++ b/devel/etcd32/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	etcd
 PORTVERSION=	3.2.32
 DISTVERSIONPREFIX=	v
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	32
@@ -16,6 +16,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		cpe go
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
+GH_TUPLE=	coreos:bbolt:v1.3.7:coreos_bbolt \
+		golang:sys:v0.5.0:golang_sys
 
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	./cmd/etcd ./cmd/etcdctl
@@ -29,6 +31,12 @@ PORTDOCS=	README.md
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
+pre-patch:
+	${RM} -r ${GO_WRKSRC}/cmd/vendor/github.com/coreos/bbolt
+	${LN} -s ${WRKDIR}/bbolt-* ${GO_WRKSRC}/cmd/vendor/github.com/coreos/bbolt
+	${RM} -r ${GO_WRKSRC}/cmd/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${GO_WRKSRC}/cmd/vendor/golang.org/x/sys
+
 post-patch:
 	${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go
 
diff --git a/devel/etcd32/distinfo b/devel/etcd32/distinfo
index ef481ffc007d..6f0f0a939d90 100644
--- a/devel/etcd32/distinfo
+++ b/devel/etcd32/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1617008642
+TIMESTAMP = 1677694930
 SHA256 (coreos-etcd-v3.2.32_GH0.tar.gz) = 3f63ccca1a1fb442c19a892b22be4018a0075da6b4d4df5f69f991e81f89cef6
 SIZE (coreos-etcd-v3.2.32_GH0.tar.gz) = 3181507
+SHA256 (coreos-bbolt-v1.3.7_GH0.tar.gz) = a99c0371bd041a3ca45bd314428976f3f13408ea53dbf2f8aa74b0288889acb2
+SIZE (coreos-bbolt-v1.3.7_GH0.tar.gz) = 116699
+SHA256 (golang-sys-v0.5.0_GH0.tar.gz) = 810c8f1b7704674971ab6b2b614aba20a5a1765018fd2c639f528dbbcbf88b1f
+SIZE (golang-sys-v0.5.0_GH0.tar.gz) = 1429723



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303032131.323LVLDU022810>