fix definition of GOPATH for go1.5
fix definition of gobuild function for non-debug way
This commit is contained in:
parent
7ab66f3e38
commit
dc368ebdf4
1 changed files with 7 additions and 3 deletions
10
etcd.spec
10
etcd.spec
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
Name: %{repo}
|
||||
Version: 2.0.13
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: A highly-available key value store for shared configuration
|
||||
License: ASL 2.0
|
||||
URL: https://%{import_path}
|
||||
|
|
@ -139,13 +139,13 @@ find . -name "*.go" \
|
|||
mkdir -p src/github.com/coreos
|
||||
ln -s ../../../ src/github.com/coreos/etcd
|
||||
|
||||
export GOPATH=$(pwd):%{gopath}:$GOPATH
|
||||
export GOPATH=$(pwd):%{gopath}
|
||||
|
||||
%if 0%{?with_debug}
|
||||
# *** ERROR: No build ID note found in /.../BUILDROOT/etcd-2.0.0-1.rc1.fc22.x86_64/usr/bin/etcd
|
||||
function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -X %{import_path}/version.GitSHA %{shortcommit}" -v -x "$@"; }
|
||||
%else
|
||||
function gobuild { go build -a "$@" -ldflags "-X %{import_path}/version.GitSHA %{shortcommit}"; }
|
||||
function gobuild { go build -a -ldflags "-X %{import_path}/version.GitSHA %{shortcommit}" "$@"; }
|
||||
%endif
|
||||
|
||||
gobuild -o bin/etcd %{import_path}
|
||||
|
|
@ -262,6 +262,10 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jul 20 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-4
|
||||
- fix definition of GOPATH for go1.5
|
||||
- fix definition of gobuild function for non-debug way
|
||||
|
||||
* Fri Jul 10 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-3
|
||||
- set GOMAXPROCS to use all processors available
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue