sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-11 07:40:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/consul-replicate: Unbreak with go1.13

Browse source 
===>  Building for consul-replicate-0.4.0
WORK=/tmp/go-build989497025
/usr/local/go/src/net/http/h2_bundle.go:49:2: use of vendored package not allowed
../../../vendor/golang.org/x/net/http2/transport.go:31:2: use of vendored package not allowed
*** Error code 1

- Remove custom targets

PR:		240173
Submitted by:	Dmitri Goutnik <dg@syrec.org>
Pointy hat:	jlaffaye
This commit is contained in:
Tobias Kortkamp 2019-09-08 12:24:20 +00:00
parent 96a9e883c7
commit 7da99c8d61
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=511570
1 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
sysutils/consul-replicate/Makefile
View file

@ -11,13 +11,17 @@ COMMENT= Consul cross-DC KV replication daemon
LICENSE= MPL20 LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= fails to build USES= go
USES= compiler go
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= hashicorp GH_ACCOUNT= hashicorp
GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME}
GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME}
GO_BUILDFLAGS= -ldflags="\
-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${PORTVERSION} \
-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=675a2c2 \
-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitDescribe=v${PORTVERSION} \
"
USE_RC_SUBR= consul-replicate USE_RC_SUBR= consul-replicate
@ -26,29 +30,4 @@ PLIST_FILES= bin/${PORTNAME}
USERS= consul USERS= consul
GROUPS= consul GROUPS= consul
post-extract: .include <bsd.port.mk>
@${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/
do-build:
@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \
${SETENV} CGO_ENABLED=0 ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} \
go build -v -x -ldflags "\
-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${PORTVERSION} \
-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=675a2c2 \
-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitDescribe=v${PORTVERSION} \
" -o bin/${PORTNAME}
do-install:
${INSTALL_PROGRAM} \
${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} \
${STAGEDIR}${PREFIX}/bin/${PORTNAME}
.include <bsd.port.pre.mk>
# golang assumes that if clang is in use, it is called "clang" and not "cc". If
# it's called "cc", go fails.
.if ${COMPILER_TYPE} == clang
BUILD_ENV= CC=clang
.endif
.include <bsd.port.post.mk>