From owner-svn-ports-head@freebsd.org Mon Apr 1 20:09:05 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F3DD156DA02; Mon, 1 Apr 2019 20:09:05 +0000 (UTC) (envelope-from tobik@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B6CD486F98; Mon, 1 Apr 2019 20:09:04 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 920C91B632; Mon, 1 Apr 2019 20:09:04 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x31K94BK027743; Mon, 1 Apr 2019 20:09:04 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x31K94YG027742; Mon, 1 Apr 2019 20:09:04 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201904012009.x31K94YG027742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 1 Apr 2019 20:09:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497513 - head/sysutils/consul-replicate X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/sysutils/consul-replicate X-SVN-Commit-Revision: 497513 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B6CD486F98 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2019 20:09:05 -0000 Author: tobik Date: Mon Apr 1 20:09:04 2019 New Revision: 497513 URL: https://svnweb.freebsd.org/changeset/ports/497513 Log: sysutils/consul-replicate: Unbreak build with Go 1.12 - Remove GOCACHE=off as build cache is required starting from Go 1.12 [1] - Pass MAKE_ENV (so GOCACHE defaults to $WRKDIR/.cache) [1] https://tip.golang.org/doc/go1.12#gocache PR: 236033 Submitted by: Dmitri Goutnik Approved by: jhixson (maintainer) Modified: head/sysutils/consul-replicate/Makefile Modified: head/sysutils/consul-replicate/Makefile ============================================================================== --- head/sysutils/consul-replicate/Makefile Mon Apr 1 20:05:07 2019 (r497512) +++ head/sysutils/consul-replicate/Makefile Mon Apr 1 20:09:04 2019 (r497513) @@ -11,8 +11,6 @@ COMMENT= Consul cross-DC KV replication daemon LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build - BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go USES= compiler @@ -33,7 +31,7 @@ post-extract: do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \ - ${SETENV} CGO_ENABLED=0 ${BUILD_ENV} GOCACHE=off GOPATH=${WRKSRC} \ + ${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 \