mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-06 18:02:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2183 from marineam/ldflags

Browse Source 
*: fix ldflags for go1.7
This commit is contained in:
Michael Marineau 2016-09-07 18:18:30 -07:00 committed by GitHub
commit 657255cb9c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild vendored
View File

@ -34,9 +34,9 @@ src_compile(){
v=$(git describe --long --dirty) || die v=$(git describe --long --dirty) || die
v=${v#v} v=${v#v}
v=${v/-/+} v=${v/-/+}
GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version ${v}" GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version=${v}"
else else
GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version ${PV}" GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version=${PV}"
fi fi
go_build "${COREOS_GO_PACKAGE}/acbuild" go_build "${COREOS_GO_PACKAGE}/acbuild"

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild vendored
View File

@ -40,7 +40,7 @@ src_prepare() {
src_compile() { src_compile() {
export GO15VENDOREXPERIMENT="1" export GO15VENDOREXPERIMENT="1"
GO_LDFLAGS="-X main.version $(git describe --dirty)" || die GO_LDFLAGS="-X main.version=$(git describe --dirty)" || die
coreos-go_src_compile coreos-go_src_compile
} }

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild vendored
View File

@ -25,7 +25,7 @@ IUSE=""
src_compile() { src_compile() {
export GO15VENDOREXPERIMENT="1" export GO15VENDOREXPERIMENT="1"
GO_LDFLAGS="-X main.version $(git describe --dirty)" || die GO_LDFLAGS="-X main.version=$(git describe --dirty)" || die
go_build "${COREOS_GO_PACKAGE}/internal" go_build "${COREOS_GO_PACKAGE}/internal"
} }

2
sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild vendored
View File

@ -31,7 +31,7 @@ RDEPEND="!dev-db/etcd:0
!dev-db/etcdctl" !dev-db/etcdctl"
src_compile() { src_compile() {
GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/version.GitSHA ${CROS_WORKON_COMMIT:0:7}" GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/version.GitSHA=${CROS_WORKON_COMMIT:0:7}"
go_build "${COREOS_GO_PACKAGE}" go_build "${COREOS_GO_PACKAGE}"
go_build "${COREOS_GO_PACKAGE}/etcdctl" go_build "${COREOS_GO_PACKAGE}/etcdctl"
} }