From f4f7d7d43a52d09506c5f64f06fcca2e195d76a7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 05 2015 13:31:17 +0000 Subject: import golang-1.3.3-3.el7 --- diff --git a/SOURCES/golang-1.3.1-disable-test-on-i686-arch.patch b/SOURCES/golang-1.3.1-disable-test-on-i686-arch.patch new file mode 100644 index 0000000..561d6f1 --- /dev/null +++ b/SOURCES/golang-1.3.1-disable-test-on-i686-arch.patch @@ -0,0 +1,38 @@ +From 25dd41f8dad8752cc1016e3160844d8d2bee0635 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hr=C4=8Dka?= +Date: Thu, 11 Sep 2014 15:15:52 +0200 +Subject: [PATCH] Disable test on i686 arch + +--- + src/pkg/runtime/runtime_test.go | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/pkg/runtime/runtime_test.go b/src/pkg/runtime/runtime_test.go +index 5a9f52f..1f08604 100644 +--- a/src/pkg/runtime/runtime_test.go ++++ b/src/pkg/runtime/runtime_test.go +@@ -178,6 +178,10 @@ func TestSetPanicOnFault(t *testing.T) { + t.Skip("skipping test on dragonfly/386") + } + ++ if GOARCH == "386" { ++ t.Skip("skipping test on 386") ++ } ++ + old := debug.SetPanicOnFault(true) + defer debug.SetPanicOnFault(old) + +@@ -191,6 +195,10 @@ func testSetPanicOnFault(t *testing.T, addr uintptr) { + t.Skip("nacl doesn't seem to fault on high addresses") + } + ++ if GOARCH == "386" { ++ t.Skip("skipping test on 386") ++ } ++ + defer func() { + if err := recover(); err == nil { + t.Fatalf("did not find error in recover") +-- +1.8.3.1 + diff --git a/SPECS/golang.spec b/SPECS/golang.spec index 7ea5424..f44bf77 100644 --- a/SPECS/golang.spec +++ b/SPECS/golang.spec @@ -39,7 +39,7 @@ Name: golang Version: 1.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Go Programming Language License: BSD @@ -49,6 +49,11 @@ Source0: https://storage.googleapis.com/golang/go%{version}.src.tar.gz # this command moved places %if 0%{?fedora} >= 21 BuildRequires: /usr/bin/hostname +Patch210: golang-f21-hostname.patch + +# Patch211 - F21+ has glibc 2.19.90 (2.20 devel)+ which deprecates +# _BSD_SOURCE and _SVID_SOURCE +Patch211: golang-1.2-BSD-SVID-SOURCE.patch %else BuildRequires: /bin/hostname @@ -76,6 +81,8 @@ Patch4: ./go1.3-tar_reuse_buffer_writeHeader.patch # https://code.google.com/p/go/source/detail?r=1b17b3426e3c Patch5: ./go1.3-tar-fix_writing_of_pax_headers.patch +Patch212: golang-1.3.1-disable-test-on-i686-arch.patch + # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -354,6 +361,9 @@ end # buffer the PAX header %patch5 -p1 +# disable test +%patch212 -p1 + # create a [dirty] gcc wrapper to allow us to build with our own flags # (dirty because it is spoofing 'gcc' since CC value is stored in the go tool) # TODO: remove this and just set CFLAGS/LDFLAGS once upstream supports it @@ -895,7 +905,7 @@ fi %changelog -* Tue Oct 21 2014 Tomas Hrcka - 1.3.3-2 +* Tue Oct 21 2014 Tomas Hrcka - 1.3.3-3 - Restrict go_arches to x64 only * Wed Oct 01 2014 Vincent Batts - 1.3.3-1