- added binutils patch (disable compressed-debug-sections, now enabled by default...

  but not supported by cgo; fixes external linkmode)
- now builds, release 1

diff --git a/golang-binutils.patch b/golang-binutils.patch
new file mode 100644 (file)
index 0000000..75e92d1
--- /dev/null
+++ b/golang-binutils.patch
@@ -0,0 +1,10 @@
+--- golang-1.4.2/src/cmd/cgo/gcc.go.orig       2015-02-18 05:38:34.000000000 +0100
++++ golang-1.4.2/src/cmd/cgo/gcc.go    2015-06-28 11:34:02.057120270 +0200
+@@ -764,6 +764,7 @@
+               "-gdwarf-2",   // generate DWARF v2 debugging symbols
+               "-c",          // do not link
+               "-xc",         // input language is C
++              "-Wa,--compress-debug-sections=none",   // do not compress debug sections
+       )
+       if strings.Contains(c[0], "clang") {
+               c = append(c,

diff --git a/golang.spec b/golang.spec
index 480140dc00a2010a873f0dccd7785ba5258969c4..68e4e4ee94ac7143b605d040f7c379a0408d3f83 100644 (file)
--- a/golang.spec
+++ b/golang.spec
@@ -8,7 +8,7 @@
 # - subpackage -src files?
 
 # Conditional build:
-%bcond_without tests   # build without tests
+%bcond_without tests   # build without tests [nop actually]
 %bcond_without verbose # verbose build (V=1)
 %bcond_with    emacs   # Go mode for Emacs
 %bcond_with    vim     # Go syntax files for Vim
@@ -17,13 +17,14 @@ Summary:    Go compiler and tools
 Summary(pl.UTF-8):     Kompilator języka Go i narzędzia
 Name:          golang
 Version:       1.4.2
-Release:       0.1
+Release:       1
 License:       BSD
 Group:         Development/Languages
 # Source0Download: https://golang.org/dl/
 Source0:       https://storage.googleapis.com/golang/go%{version}.src.tar.gz
 # Source0-md5: 907f85c8fa765d31f7f955836fec4049
 Patch0:                ca-certs.patch
+Patch1:                %{name}-binutils.patch
 URL:           http://golang.org/
 BuildRequires: bash
 BuildRequires: rpm-pythonprov
@@ -112,6 +113,7 @@ Tryb Go dla Emacsa.
 %setup -qc
 mv go/* .
 %patch0 -p1
+%patch1 -p1
 
 cat > env.sh <<'EOF'
 export GOROOT=$(pwd)