From 573d0baf6acb69f8fd279fd74b7c45b00463072b Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 12 May 2014 09:29:32 -0400 Subject: [PATCH 1/4] not sure why go1.2.2 shuffled some of the arch-depenedent files, but so it goes --- golang.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/golang.spec b/golang.spec index ae77ac1..22736e1 100644 --- a/golang.spec +++ b/golang.spec @@ -39,7 +39,7 @@ Name: golang Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Go Programming Language License: BSD @@ -636,9 +636,14 @@ fi %{goroot}/src/ # files that are generated based on compile-time ARCH will go in that arch's pkg-bin-* %ifarch %{ix86} -%exclude %{goroot}/src/cmd/8l/enam.c + +# this is wacky that now these files are generated in a different arch +#%exclude %{goroot}/src/cmd/8l/enam.c +#%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go +%exclude %{goroot}/src/cmd/6l/enam.c +%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go + %exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h -%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go %exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c %exclude %{goroot}/src/pkg/runtime/zmprof_linux_386.c %exclude %{goroot}/src/pkg/runtime/znetpoll_linux_386.c @@ -652,9 +657,7 @@ fi %endif %ifarch x86_64 -%exclude %{goroot}/src/cmd/6l/enam.c %exclude %{goroot}/src/pkg/runtime/zasm_linux_amd64.h -%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go %exclude %{goroot}/src/pkg/runtime/zmprof_linux_amd64.c %exclude %{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c %exclude %{goroot}/src/pkg/runtime/znetpoll_linux_amd64.c @@ -895,6 +898,9 @@ fi %changelog +* Fri May 09 2014 Vincent Batts 1.2.2-2 +- more arch file shuffling + * Fri May 09 2014 Vincent Batts 1.2.2-1 - update to go1.2.2 From 28979baa990379368059d97722dd1134cf2cccfb Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 12 May 2014 15:00:01 -0400 Subject: [PATCH 2/4] more rearranging --- golang.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/golang.spec b/golang.spec index 22736e1..f12a37a 100644 --- a/golang.spec +++ b/golang.spec @@ -638,10 +638,8 @@ fi %ifarch %{ix86} # this is wacky that now these files are generated in a different arch -#%exclude %{goroot}/src/cmd/8l/enam.c -#%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go -%exclude %{goroot}/src/cmd/6l/enam.c -%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go +%exclude %{goroot}/src/cmd/8l/enam.c +%exclude %{goroot}/src/pkg/runtime/zgoarch_386.go %exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h %exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c @@ -657,6 +655,9 @@ fi %endif %ifarch x86_64 +%exclude %{goroot}/src/cmd/6l/enam.c +%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go + %exclude %{goroot}/src/pkg/runtime/zasm_linux_amd64.h %exclude %{goroot}/src/pkg/runtime/zmprof_linux_amd64.c %exclude %{goroot}/src/pkg/runtime/zmalloc_linux_amd64.c @@ -672,8 +673,9 @@ fi %ifarch %{arm} %exclude %{goroot}/src/cmd/5l/enam.c -%exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h %exclude %{goroot}/src/pkg/runtime/zgoarch_arm.go + +%exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h %exclude %{goroot}/src/pkg/runtime/znetpoll_linux_arm.c %exclude %{goroot}/src/pkg/runtime/zmalloc_linux_arm.c %exclude %{goroot}/src/pkg/runtime/zmprof_linux_arm.c From e46d680a80f3e63a6b258d07dbf02ce92fe8586c Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 13 May 2014 13:01:30 -0400 Subject: [PATCH 3/4] nach ein mahl --- golang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/golang.spec b/golang.spec index f12a37a..dde9e73 100644 --- a/golang.spec +++ b/golang.spec @@ -640,6 +640,8 @@ fi # this is wacky that now these files are generated in a different arch %exclude %{goroot}/src/cmd/8l/enam.c %exclude %{goroot}/src/pkg/runtime/zgoarch_386.go +%exclude %{goroot}/src/cmd/6l/enam.c +%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go %exclude %{goroot}/src/pkg/runtime/zasm_linux_386.h %exclude %{goroot}/src/pkg/runtime/zmalloc_linux_386.c From 789ff2e39dc8dbfe46cb37fe192fdd7e275ba558 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 13 May 2014 13:04:10 -0400 Subject: [PATCH 4/4] nach ein mahl --- golang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/golang.spec b/golang.spec index dde9e73..f4e5701 100644 --- a/golang.spec +++ b/golang.spec @@ -676,6 +676,8 @@ fi %ifarch %{arm} %exclude %{goroot}/src/cmd/5l/enam.c %exclude %{goroot}/src/pkg/runtime/zgoarch_arm.go +%exclude %{goroot}/src/cmd/6l/enam.c +%exclude %{goroot}/src/pkg/runtime/zgoarch_amd64.go %exclude %{goroot}/src/pkg/runtime/zasm_linux_arm.h %exclude %{goroot}/src/pkg/runtime/znetpoll_linux_arm.c