Browse code
Updated go to version 1.6.2
Change-Id: Ifee9e50a38af47b11ea71bbc211dba461dd3c49c
Reviewed-on: http://photon-jenkins.eng.vmware.com/1193
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
(cherry picked from commit 1f08960739cc52de771bdd34acf552e7423fe5cd)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1238
Reviewed-by: suezzelur <anishs@vmware.com>
Tested-by: suezzelur <anishs@vmware.com>
harishspqr authored on 2016/07/19 04:07:33Showing 2 changed files
| ... | ... |
@@ -9,18 +9,18 @@ |
| 9 | 9 |
|
| 10 | 10 |
Summary: Go |
| 11 | 11 |
Name: go |
| 12 |
-Version: 1.4.2 |
|
| 13 |
-Release: 5%{?dist}
|
|
| 12 |
+Version: 1.6.2 |
|
| 13 |
+Release: 1%{?dist}
|
|
| 14 | 14 |
License: BSD |
| 15 | 15 |
URL: https://golang/org |
| 16 | 16 |
Group: System Environment/Security |
| 17 | 17 |
Vendor: VMware, Inc. |
| 18 | 18 |
Distribution: Photon |
| 19 | 19 |
Source0: https://storage.googleapis.com/golang/%{name}%{version}.src.tar.gz
|
| 20 |
-%define sha1 go=460caac03379f746c473814a65223397e9c9a2f6 |
|
| 20 |
+%define sha1 go=09232ac0e76635cc9e0a1f33a81bf03ae9cb9db5 |
|
| 21 |
+Patch0: go_imports_fix.patch |
|
| 21 | 22 |
BuildRequires: mercurial |
| 22 | 23 |
Requires: mercurial |
| 23 |
-# We strip meta dependency, but go requires glibc. |
|
| 24 | 24 |
Requires: glibc |
| 25 | 25 |
|
| 26 | 26 |
%description |
| ... | ... |
@@ -28,11 +28,17 @@ Go is an open source programming language that makes it easy to build simple, re |
| 28 | 28 |
|
| 29 | 29 |
%prep |
| 30 | 30 |
%setup -qn %{name}
|
| 31 |
+%patch0 -p1 |
|
| 31 | 32 |
|
| 32 | 33 |
%build |
| 33 |
-export GOROOT_FINAL=%{goroot}
|
|
| 34 | 34 |
export GOHOSTOS=linux |
| 35 | 35 |
export GOHOSTARCH=%{gohostarch}
|
| 36 |
+export GOROOT_BOOTSTRAP=%{goroot}
|
|
| 37 |
+ |
|
| 38 |
+export GOROOT="`pwd`" |
|
| 39 |
+export GOPATH=%{gopath}
|
|
| 40 |
+export GOROOT_FINAL=%{_bindir}/go
|
|
| 41 |
+rm -f %{gopath}/src/runtime/*.c
|
|
| 36 | 42 |
pushd src |
| 37 | 43 |
./make.bash --no-clean |
| 38 | 44 |
popd |
| ... | ... |
@@ -43,8 +49,7 @@ rm -rf %{buildroot}
|
| 43 | 43 |
mkdir -p %{buildroot}%{_bindir}
|
| 44 | 44 |
mkdir -p %{buildroot}%{goroot}
|
| 45 | 45 |
|
| 46 |
-cp -apv api bin doc favicon.ico include lib pkg robots.txt src misc VERSION \ |
|
| 47 |
- %{buildroot}%{goroot}
|
|
| 46 |
+cp -R api bin doc favicon.ico lib pkg robots.txt src misc VERSION %{buildroot}%{goroot}
|
|
| 48 | 47 |
|
| 49 | 48 |
# remove the unnecessary zoneinfo file (Go will always use the system one first) |
| 50 | 49 |
rm -rfv %{buildroot}%{goroot}/lib/time
|
| ... | ... |
@@ -104,17 +109,14 @@ rm -rf %{buildroot}/*
|
| 104 | 104 |
%exclude %{goroot}/include/plan9
|
| 105 | 105 |
/etc/profile.d/go-exports.sh |
| 106 | 106 |
%{goroot}/*
|
| 107 |
-%dir %{gopath}
|
|
| 108 |
-%dir %{gopath}/src
|
|
| 109 |
-%dir %{gopath}/src/github.com/
|
|
| 110 |
-%dir %{gopath}/src/bitbucket.org/
|
|
| 111 |
-%dir %{gopath}/src/code.google.com/
|
|
| 112 |
-%dir %{gopath}/src/code.google.com/p/
|
|
| 107 |
+%{gopath}/src
|
|
| 113 | 108 |
%exclude %{goroot}/src/pkg/debug/dwarf/testdata
|
| 114 | 109 |
%exclude %{goroot}/src/pkg/debug/elf/testdata
|
| 115 | 110 |
%{_bindir}/*
|
| 116 | 111 |
|
| 117 | 112 |
%changelog |
| 113 |
+* Fri Jul 8 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.6.2-1 |
|
| 114 |
+- Updated the Golang to version 1.6.2 |
|
| 118 | 115 |
* Thu Jun 2 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.4.2-5 |
| 119 | 116 |
- Fix script syntax |
| 120 | 117 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.4.2-4 |
| 121 | 118 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,11 @@ |
| 0 |
+--- a/src/go/internal/gcimporter/exportdata.go 2016-02-17 12:35:17.000000000 -0800 |
|
| 1 |
+@@ -79,7 +79,7 @@ |
|
| 2 |
+ } |
|
| 3 |
+ |
|
| 4 |
+ // First real entry should be __.PKGDEF. |
|
| 5 |
+- if name != "__.PKGDEF" {
|
|
| 6 |
++ if name != "__.PKGDEF" && name != "__.PKGDEF/" {
|
|
| 7 |
+ err = errors.New("go archive is missing __.PKGDEF")
|
|
| 8 |
+ return |
|
| 9 |
+ } |